cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

_86Box: 3.11 -> 4.0

Browse source
This commit is contained in:
John Chadwick 2023-09-01 23:01:37 -04:00
parent f31b3c65e0
commit accb86debe
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/applications/emulators/86box/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, makeWrapper, freetype, SDL2 { stdenv, lib, fetchFromGitHub, cmake, pkg-config, makeWrapper, freetype, SDL2
, glib, pcre2, openal, rtmidi, fluidsynth, jack2, alsa-lib, qt5, libvncserver , glib, pcre2, openal, rtmidi, fluidsynth, jack2, alsa-lib, qt5, libvncserver
, discord-gamesdk, libpcap , discord-gamesdk, libpcap, libslirp
, enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch , enableDynarec ? with stdenv.hostPlatform; isx86 || isAarch
, enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch , enableNewDynarec ? enableDynarec && stdenv.hostPlatform.isAarch
@ -10,13 +10,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "86Box"; pname = "86Box";
version = "3.11"; version = "4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "86Box"; owner = "86Box";
repo = "86Box"; repo = "86Box";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-n3Q/NUiaC6/EZyBUn6jUomnQCqr8tvYKPI5JrRRFScI="; hash = "sha256-VTfYCVEbArcYVzh3NkX1yBXhtRnGZ/+khk0KG42fs24=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
freetype freetype
fluidsynth
SDL2 SDL2
glib glib
openal openal
@ -35,6 +36,7 @@ stdenv.mkDerivation rec {
pcre2 pcre2
jack2 jack2
libpcap libpcap
libslirp
qt5.qtbase qt5.qtbase
qt5.qttools qt5.qttools
] ++ lib.optional stdenv.isLinux alsa-lib ] ++ lib.optional stdenv.isLinux alsa-lib
@ -60,7 +62,6 @@ stdenv.mkDerivation rec {
postFixup = let postFixup = let
libPath = lib.makeLibraryPath ([ libPath = lib.makeLibraryPath ([
libpcap libpcap
fluidsynth
] ++ lib.optional unfreeEnableDiscord discord-gamesdk); ] ++ lib.optional unfreeEnableDiscord discord-gamesdk);
libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libPathVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH";
in in