diff options
Diffstat (limited to 'pkgs/applications/emulators')
-rw-r--r-- | pkgs/applications/emulators/pcsx2/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/emulators/retroarch/cores.nix | 16 | ||||
-rw-r--r-- | pkgs/applications/emulators/retroarch/hashes.json | 12 | ||||
-rwxr-xr-x | pkgs/applications/emulators/retroarch/update_cores.py | 2 | ||||
-rw-r--r-- | pkgs/applications/emulators/ryujinx/default.nix | 6 |
5 files changed, 42 insertions, 4 deletions
diff --git a/pkgs/applications/emulators/pcsx2/default.nix b/pkgs/applications/emulators/pcsx2/default.nix index 59ccbea496cd..a46c02304416 100644 --- a/pkgs/applications/emulators/pcsx2/default.nix +++ b/pkgs/applications/emulators/pcsx2/default.nix @@ -23,6 +23,7 @@ , rapidyaml , SDL2 , soundtouch +, strip-nondeterminism , vulkan-headers , vulkan-loader , wayland @@ -58,7 +59,13 @@ stdenv.mkDerivation rec { "-DDISABLE_BUILD_DATE=TRUE" ]; - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook zip ]; + nativeBuildInputs = [ + cmake + pkg-config + strip-nondeterminism + wrapQtAppsHook + zip + ]; buildInputs = [ curl @@ -95,6 +102,7 @@ stdenv.mkDerivation rec { install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/* + strip-nondeterminism $out/bin/resources/patches.zip ''; qtWrapperArgs = [ diff --git a/pkgs/applications/emulators/retroarch/cores.nix b/pkgs/applications/emulators/retroarch/cores.nix index 5da2ad763187..8da558bfbeb0 100644 --- a/pkgs/applications/emulators/retroarch/cores.nix +++ b/pkgs/applications/emulators/retroarch/cores.nix @@ -426,6 +426,14 @@ in }; }; + fuse = mkLibretroCore { + core = "fuse"; + meta = { + description = "A port of the Fuse Unix Spectrum Emulator to libretro"; + license = lib.licenses.gpl3Only; + }; + }; + gambatte = mkLibretroCore { core = "gambatte"; meta = { @@ -970,6 +978,14 @@ in }; }; + twenty-fortyeight = mkLibretroCore { + core = "2048"; + meta = { + description = "Port of 2048 puzzle game to the libretro API"; + license = lib.licenses.unlicense; + }; + }; + vba-m = mkLibretroCore { core = "vbam"; src = getCoreSrc "vba-m"; diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e18361c0d35d..903708aabd69 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -1,4 +1,10 @@ { + "2048": { + "owner": "libretro", + "repo": "libretro-2048", + "rev": "331c1de588ed8f8c370dcbc488e5434a3c09f0f2", + "sha256": "gPrAmoBnfuTnW6t699pqS43vE6t0ca3jZcqTNRaJipA=" + }, "atari800": { "owner": "libretro", "repo": "libretro-atari800", @@ -180,6 +186,12 @@ "rev": "9a65ec6e31d48ad0dae1f381c1ec61c897f970cb", "sha256": "ZeWw/K6i04XRympqZ6sQG/yjN8cJglVcIkxpyRHx424=" }, + "fuse": { + "owner": "libretro", + "repo": "fuse-libretro", + "rev": "847dbbd6f787823ac9a5dfacdd68ab181063374e", + "sha256": "jzS7SFALV/YjI77ST+IWHwUsuhT+Zr5w4t6C7O8yzFM=" + }, "gambatte": { "owner": "libretro", "repo": "gambatte-libretro", diff --git a/pkgs/applications/emulators/retroarch/update_cores.py b/pkgs/applications/emulators/retroarch/update_cores.py index 4ed9dbf34080..bd325e5739a7 100755 --- a/pkgs/applications/emulators/retroarch/update_cores.py +++ b/pkgs/applications/emulators/retroarch/update_cores.py @@ -12,6 +12,7 @@ SCRIPT_PATH = Path(__file__).absolute().parent HASHES_PATH = SCRIPT_PATH / "hashes.json" GET_REPO_THREADS = int(os.environ.get("GET_REPO_THREADS", 8)) CORES = { + "2048": {"repo": "libretro-2048"}, "atari800": {"repo": "libretro-atari800"}, "beetle-gba": {"repo": "beetle-gba-libretro"}, "beetle-lynx": {"repo": "beetle-lynx-libretro"}, @@ -42,6 +43,7 @@ CORES = { "flycast": {"repo": "flycast"}, "fmsx": {"repo": "fmsx-libretro"}, "freeintv": {"repo": "freeintv"}, + "fuse": {"repo": "fuse-libretro"}, "gambatte": {"repo": "gambatte-libretro"}, "genesis-plus-gx": {"repo": "Genesis-Plus-GX"}, "gpsp": {"repo": "gpsp"}, diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 8265da3213da..690f2cbc89db 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -28,13 +28,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.898"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.900"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "649d372f7da8559f8b6d74ca44af64ba7d7853c4"; - sha256 = "0vi87qd99dzshg4raiw158b3d5l62y359kandfabjqbjn7614bpp"; + rev = "d604e982276105db043ca495a16f1b047bb2d0f6"; + sha256 = "0fsl2cw0y7jfj9b75w4x213x9hsxkfprvb6riin87yrdhmjkwa4r"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; |