Unverified Commit 4b4c7536 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #225744 from lasers/citra 

citra: nightly 1873 -> 1907, canary 2440 -> 2484
parents 4b329b6e 23739d2d

pkgs/applications/emulators/citra/default.nix

+10 −10
Original line number Diff line number Diff line 
{ branch

, libsForQt5

, qt6Packages

, fetchFromGitHub

, fetchurl

}:



let

  # Fetched from https://api.citra-emu.org/gamedb, last updated 2022-05-02

  # Fetched from https://api.citra-emu.org/gamedb

  # Please make sure to update this when updating citra!

  compat-list = fetchurl {

    name = "citra-compat-list";

    url = "https://web.archive.org/web/20220502114622/https://api.citra-emu.org/gamedb/";

    sha256 = "sha256-blIlaYaUQjw7Azgg+Dd7ZPEQf+ddZMO++Yxinwe+VG0=";

    url = "https://web.archive.org/web/20230512234055/https://api.citra-emu.org/gamedb/";

    hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU=";

  };

in {

  nightly = libsForQt5.callPackage ./generic.nix rec {

  nightly = qt6Packages.callPackage ./generic.nix rec {

    pname = "citra-nightly";

    version = "1873";

    version = "1907";



    src = fetchFromGitHub {

      owner = "citra-emu";

      repo = "citra-nightly";

      rev = "nightly-${version}";

      sha256 = "1csn9n1s2mvxwk2mahwm8mc4zgn40im374hcsqgz8gaxjkmnx288";

      sha256 = "l4pqok42/ybnRX90Qwhcgm2JR4/9C5bbCTk3j4QuWtw=";

      fetchSubmodules = true;

    };



    inherit branch compat-list;

  };



  canary = libsForQt5.callPackage ./generic.nix rec {

  canary = qt6Packages.callPackage ./generic.nix rec {

    pname = "citra-canary";

    version = "2440";

    version = "2484";



    src = fetchFromGitHub {

      owner = "citra-emu";

      repo = "citra-canary";

      rev = "canary-${version}";

      sha256 = "06f2qnvywyaf8jc43jrzjhfshj3k21ggk8wdrvd9wjsmrryvqgbz";

      sha256 = "IgCpqt3rKV9IqNstF4QwnJlE3hPH+BkIhaOvEmshh0U=";

      fetchSubmodules = true;

    };

pkgs/applications/emulators/citra/generic.nix

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ stdenv.mkDerivation rec { 
    "-DCITRA_USE_BUNDLED_FFMPEG=OFF"

    "-DCITRA_USE_BUNDLED_QT=OFF"

    "-DUSE_SYSTEM_SDL2=ON"

    "-DCMAKE_INSTALL_INCLUDEDIR=include"

    "-DCMAKE_INSTALL_LIBDIR=lib"



    # We dont want to bother upstream with potentially outdated compat reports

    "-DCITRA_ENABLE_COMPATIBILITY_REPORTING=ON"