diff options
Diffstat (limited to 'pkgs/applications/emulators')
| -rw-r--r-- | pkgs/applications/emulators/bochs/default.nix | 65 | ||||
| -rw-r--r-- | pkgs/applications/emulators/mame/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/emulators/mame/emuopts.patch | 57 | ||||
| -rw-r--r-- | pkgs/applications/emulators/rpcs3/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/emulators/ryujinx/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/emulators/ryujinx/deps.nix | 2 |
6 files changed, 79 insertions, 63 deletions
diff --git a/pkgs/applications/emulators/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix index 8b7cc9fad067..3bfbf08c185c 100644 --- a/pkgs/applications/emulators/bochs/default.nix +++ b/pkgs/applications/emulators/bochs/default.nix @@ -1,21 +1,26 @@ { lib , stdenv , fetchurl -, SDL2 -, curl , docbook_xml_dtd_45 , docbook_xsl -, gtk2 +, libtool +, pkg-config +, curl +, readline +, wget +, libobjc +, enableX11 ? !stdenv.isDarwin , libGL , libGLU , libX11 , libXpm -, libtool +, enableSdl2 ? true +, SDL2 +, enableTerm ? true , ncurses -, pkg-config -, readline -, wget +, enableWx ? !stdenv.isDarwin , wxGTK +, gtk3 }: stdenv.mkDerivation (finalAttrs: { @@ -35,23 +40,26 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - SDL2 curl - gtk2 + readline + wget + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + ] ++ lib.optionals enableX11 [ libGL libGLU libX11 libXpm + ] ++ lib.optionals enableSdl2 [ + SDL2 + ] ++ lib.optionals enableTerm [ ncurses - readline - wget + ] ++ lib.optionals enableWx [ wxGTK + gtk3 ]; configureFlags = [ - "--with-x=yes" - "--with-x11=yes" - "--with-rfb=no" "--with-vncsrv=no" "--with-nogui" @@ -84,8 +92,6 @@ stdenv.mkDerivation (finalAttrs: { "--enable-cpu-level=6" # from 3 to 6 "--enable-debugger" #conflicts with gdb-stub option "--enable-debugger-gui" - "--enable-e1000" - "--enable-es1370" "--enable-evex" "--enable-fpu" "--enable-gdb-stub=no" # conflicts with debugger option @@ -94,12 +100,8 @@ stdenv.mkDerivation (finalAttrs: { "--enable-iodebug" "--enable-large-ramfile" "--enable-largefile" - "--enable-ne2000" "--enable-pci" - "--enable-plugins=yes" - "--enable-pnic" "--enable-repeat-speedups" - "--enable-sb16" "--enable-show-ips" "--enable-smp" "--enable-vmx=2" @@ -112,11 +114,23 @@ stdenv.mkDerivation (finalAttrs: { "--enable-voodoo" "--enable-x86-64" "--enable-x86-debugger" - ] - # Boolean flags - ++ lib.optionals (SDL2 != null) [ "--with-sdl2" ] - ++ lib.optionals (ncurses != null) [ "--with-term" ] - ++ lib.optionals (gtk2 != null && wxGTK != null) [ "--with-wx" ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ + "--enable-e1000" + "--enable-es1370" + "--enable-ne2000" + "--enable-plugins" + "--enable-pnic" + "--enable-sb16" + ] ++ lib.optionals enableX11 [ + "--with-x" + "--with-x11" + ] ++ lib.optionals enableSdl2 [ + "--with-sdl2" + ] ++ lib.optionals enableTerm [ + "--with-term" + ] ++ lib.optionals enableWx [ + "--with-wx" + ]; enableParallelBuilding = true; @@ -131,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.lgpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; }) # TODO: a better way to organize the options diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix index eb0f9076a17d..1b6703cb6702 100644 --- a/pkgs/applications/emulators/mame/default.nix +++ b/pkgs/applications/emulators/mame/default.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "mame"; - version = "0.243"; + version = "0.249"; src = fetchFromGitHub { owner = "mamedev"; repo = "mame"; rev = "mame${builtins.replaceStrings [ "." ] [ "" ] version}"; - sha256 = "sha256-dUgYLNvgvolz9M0ySkGJIZjVMBQwejkxsZ6npg8rIqk="; + sha256 = "sha256-im6y/E0pQxruX2kNXZLE3fHq+zXfsstnOoC1QvH4fd4="; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/emulators/mame/emuopts.patch b/pkgs/applications/emulators/mame/emuopts.patch index b85291f52f74..233d64eb15d0 100644 --- a/pkgs/applications/emulators/mame/emuopts.patch +++ b/pkgs/applications/emulators/mame/emuopts.patch @@ -1,29 +1,32 @@ -diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp -index c42fcef848..d1bddae060 100644 ---- a/src/emu/emuopts.cpp -+++ b/src/emu/emuopts.cpp -@@ -36,16 +36,16 @@ const options_entry emu_options::s_option_entries[] = - { nullptr, nullptr, OPTION_HEADER, "CORE SEARCH PATH OPTIONS" }, - { OPTION_HOMEPATH, ".", OPTION_STRING, "path to base folder for plugin data (read/write)" }, - { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", OPTION_STRING, "path to ROM sets and hard disk images" }, -- { OPTION_HASHPATH ";hash_directory;hash", "hash", OPTION_STRING, "path to software definition files" }, -- { OPTION_SAMPLEPATH ";sp", "samples", OPTION_STRING, "path to audio sample sets" }, -- { OPTION_ARTPATH, "artwork", OPTION_STRING, "path to artwork files" }, -- { OPTION_CTRLRPATH, "ctrlr", OPTION_STRING, "path to controller definitions" }, -- { OPTION_INIPATH, ".;ini;ini/presets", OPTION_STRING, "path to ini files" }, -- { OPTION_FONTPATH, ".", OPTION_STRING, "path to font files" }, -+ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", OPTION_STRING, "path to software definition files" }, -+ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", OPTION_STRING, "path to audio sample sets" }, -+ { OPTION_ARTPATH, "artwork;@mame@/artwork", OPTION_STRING, "path to artwork files" }, -+ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", OPTION_STRING, "path to controller definitions" }, -+ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", OPTION_STRING, "path to ini files" }, -+ { OPTION_FONTPATH, ".;@mame@", OPTION_STRING, "path to font files" }, - { OPTION_CHEATPATH, "cheat", OPTION_STRING, "path to cheat files" }, - { OPTION_CROSSHAIRPATH, "crosshair", OPTION_STRING, "path to crosshair files" }, -- { OPTION_PLUGINSPATH, "plugins", OPTION_STRING, "path to plugin files" }, -- { OPTION_LANGUAGEPATH, "language", OPTION_STRING, "path to UI translation files" }, -+ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", OPTION_STRING, "path to plugin files" }, -+ { OPTION_LANGUAGEPATH, "language;@mame@/language", OPTION_STRING, "path to UI translation files" }, - { OPTION_SWPATH, "software", OPTION_STRING, "path to loose software" }, +--- a/src/emu/emuopts.cpp 2022-10-29 15:05:18.591381088 +0200 ++++ b/src/emu/emuopts.cpp 2022-10-29 15:10:10.938037551 +0200 +@@ -39,16 +39,16 @@ + { nullptr, nullptr, core_options::option_type::HEADER, "CORE SEARCH PATH OPTIONS" }, + { OPTION_PLUGINDATAPATH, ".", core_options::option_type::STRING, "path to base folder for plugin data (read/write)" }, + { OPTION_MEDIAPATH ";rp;biospath;bp", "roms", core_options::option_type::STRING, "path to ROM sets and hard disk images" }, +- { OPTION_HASHPATH ";hash_directory;hash", "hash", core_options::option_type::STRING, "path to software definition files" }, +- { OPTION_SAMPLEPATH ";sp", "samples", core_options::option_type::STRING, "path to audio sample sets" }, +- { OPTION_ARTPATH, "artwork", core_options::option_type::STRING, "path to artwork files" }, +- { OPTION_CTRLRPATH, "ctrlr", core_options::option_type::STRING, "path to controller definitions" }, +- { OPTION_INIPATH, ".;ini;ini/presets", core_options::option_type::STRING, "path to ini files" }, +- { OPTION_FONTPATH, ".", core_options::option_type::STRING, "path to font files" }, ++ { OPTION_HASHPATH ";hash_directory;hash", "hash;@mame@/hash", core_options::option_type::STRING, "path to software definition files" }, ++ { OPTION_SAMPLEPATH ";sp", "samples;@mame@/samples", core_options::option_type::STRING, "path to audio sample sets" }, ++ { OPTION_ARTPATH, "artwork;@mame@/artwork", core_options::option_type::STRING, "path to artwork files" }, ++ { OPTION_CTRLRPATH, "ctrlr;@mame@/ctrlr", core_options::option_type::STRING, "path to controller definitions" }, ++ { OPTION_INIPATH, ".;ini;ini/presets;@mame@/ini/presets", core_options::option_type::STRING, "path to ini files" }, ++ { OPTION_FONTPATH, ".;@mame@", core_options::option_type::STRING, "path to font files" }, + { OPTION_CHEATPATH, "cheat", core_options::option_type::STRING, "path to cheat files" }, + { OPTION_CROSSHAIRPATH, "crosshair", core_options::option_type::STRING, "path to crosshair files" }, +- { OPTION_PLUGINSPATH, "plugins", core_options::option_type::STRING, "path to plugin files" }, +- { OPTION_LANGUAGEPATH, "language", core_options::option_type::STRING, "path to UI translation files" }, ++ { OPTION_PLUGINSPATH, "plugins;@mame@/plugins", core_options::option_type::STRING, "path to plugin files" }, ++ { OPTION_LANGUAGEPATH, "language;@mame@/language", core_options::option_type::STRING, "path to UI translation files" }, + { OPTION_SWPATH, "software", core_options::option_type::STRING, "path to loose software" }, // output directory options +@@ -1301,3 +1301,4 @@ + m_entry = entry; + return entry; + } ++ diff --git a/pkgs/applications/emulators/rpcs3/default.nix b/pkgs/applications/emulators/rpcs3/default.nix index 88c0ced4a249..f1432d8db558 100644 --- a/pkgs/applications/emulators/rpcs3/default.nix +++ b/pkgs/applications/emulators/rpcs3/default.nix @@ -9,10 +9,10 @@ let # Keep these separate so the update script can regex them - rpcs3GitVersion = "14289-0da81d22d"; - rpcs3Version = "0.0.24-14289-0da81d22d"; - rpcs3Revision = "0da81d22d340dca1ac098a9de5274641bdc77869"; - rpcs3Sha256 = "0qblfsdyngj8bb7g49am0q0mq5llwx3g4x4gi6h0jynk0d9j0ir0"; + rpcs3GitVersion = "14337-5210df688"; + rpcs3Version = "0.0.24-14337-5210df688"; + rpcs3Revision = "5210df688262ec7fd8c21230d30e568d98724c8f"; + rpcs3Sha256 = "1m0j53xl6g01s27bi2p9j23m724gq7a3hss7kqhc239a5m9akqdg"; ittapi = fetchFromGitHub { owner = "intel"; diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 765f7b12721a..73e93707ceed 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.257"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.327"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "81f1a4dc3161882b0385c9d4752fbba84b9eca96"; - sha256 = "1p4c8k8pc47hl32bml050fvxyhdjcd002xx60rwvzlgvdgw6b3xq"; + rev = "9719b6a1129c017d96532ff026e2bb933c0b2d0b"; + sha256 = "1vm1zwjm02jp64gjcfn923lxc4hqwgw44w9rspjy97q2z6r9vwjh"; }; nugetDeps = ./deps.nix; diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 39fef4cad2ee..6486c13c7952 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -159,7 +159,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.4-build24"; sha256 = "13wfjx5n540mlxlvys39g2rajrqbycdkyci2pcp3wygkqn4d87hm"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build27"; sha256 = "16i10lp4w7gi5rzjs9v9vns858n735ixcb83kl2qqq9qwyrnv8mw"; }) (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; }) (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; }) (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; }) |