Unverified Commit 96e569cb authored by Zaedus's avatar Zaedus Committed by GitHub
Browse files

citra: nightly 1765 -> 1873, canary 2146 -> 2440 (#224337)

parent c9b90221

pkgs/applications/emulators/citra/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -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;

    };

pkgs/applications/emulators/citra/generic.nix

+5 −1
Original line number Diff line number Diff line
@@ -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