diff options
| author | Zaedus <42098470+Zaedus@users.noreply.github.com> | 2023-04-05 23:44:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 01:44:58 +0200 |
| commit | 96e569cb29daa8dbcec62d4c6f947d40fd4a8a76 (patch) | |
| tree | edfca114324c84bbaadb5c759349ecbfc6892e13 | |
| parent | c9b902210366173c8bc62b46bc0eeb15c8c302d6 (diff) | |
| download | nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.tar nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.tar.gz nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.tar.bz2 nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.tar.lz nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.tar.xz nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.tar.zst nixpkgs-96e569cb29daa8dbcec62d4c6f947d40fd4a8a76.zip | |
citra: nightly 1765 -> 1873, canary 2146 -> 2440 (#224337)
| -rw-r--r-- | pkgs/applications/emulators/citra/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/emulators/citra/generic.nix | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/emulators/citra/default.nix b/pkgs/applications/emulators/citra/default.nix index 8b9f2cfd069..b27c8fb2453 100644 --- a/pkgs/applications/emulators/citra/default.nix +++ b/pkgs/applications/emulators/citra/default.nix @@ -15,13 +15,13 @@ let in { nightly = libsForQt5.callPackage ./generic.nix rec { pname = "citra-nightly"; - version = "1765"; + version = "1873"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-nightly"; rev = "nightly-${version}"; - sha256 = "0d3dfh63cmsy5idbypdz3ibydmb4a35sfv7qmxxlcpc390pp9cvq"; + sha256 = "1csn9n1s2mvxwk2mahwm8mc4zgn40im374hcsqgz8gaxjkmnx288"; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { canary = libsForQt5.callPackage ./generic.nix rec { pname = "citra-canary"; - version = "2146"; + version = "2440"; src = fetchFromGitHub { owner = "citra-emu"; repo = "citra-canary"; rev = "canary-${version}"; - sha256 = "1wnym0nklngimf5gaaa2703nz4g5iy572wlgp88h67rrh9b4f04r"; + sha256 = "06f2qnvywyaf8jc43jrzjhfshj3k21ggk8wdrvd9wjsmrryvqgbz"; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/citra/generic.nix b/pkgs/applications/emulators/citra/generic.nix index 95f66294deb..fc1a9340a49 100644 --- a/pkgs/applications/emulators/citra/generic.nix +++ b/pkgs/applications/emulators/citra/generic.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_BOOST=ON" "-DCITRA_USE_BUNDLED_FFMPEG=OFF" "-DCITRA_USE_BUNDLED_QT=OFF" - "-DCITRA_USE_BUNDLED_SDL2=OFF" + "-DUSE_SYSTEM_SDL2=ON" # We dont want to bother upstream with potentially outdated compat reports "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON" @@ -65,6 +65,10 @@ stdenv.mkDerivation rec { ++ lib.optional enableFdk "-DENABLE_FDK=ON"; postPatch = '' + # Fix file not found when looking in var/empty instead of opt + mkdir externals/dynarmic/src/dynarmic/ir/var + ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty + # Prep compatibilitylist ln -s ${compat-list} ./dist/compatibility_list/compatibility_list.json |