pyrox.dev / nixpkgs
lol
fork atom

citra: nightly 1907 -> 1963, canary 2484 -> 2573

lasers 87679fc6 e1884471

+21 -13
unified split
+6 -6
pkgs/applications/emulators/citra/default.nix
··· 9 # Please make sure to update this when updating citra! 10 compat-list = fetchurl { 11 name = "citra-compat-list"; 12 - url = "https://web.archive.org/web/20230512234055/https://api.citra-emu.org/gamedb/"; 13 - hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU="; 14 }; 15 in { 16 nightly = qt6Packages.callPackage ./generic.nix rec { 17 pname = "citra-nightly"; 18 - version = "1907"; 19 20 src = fetchFromGitHub { 21 owner = "citra-emu"; 22 repo = "citra-nightly"; 23 rev = "nightly-${version}"; 24 - sha256 = "l4pqok42/ybnRX90Qwhcgm2JR4/9C5bbCTk3j4QuWtw="; 25 fetchSubmodules = true; 26 }; 27 ··· 30 31 canary = qt6Packages.callPackage ./generic.nix rec { 32 pname = "citra-canary"; 33 - version = "2484"; 34 35 src = fetchFromGitHub { 36 owner = "citra-emu"; 37 repo = "citra-canary"; 38 rev = "canary-${version}"; 39 - sha256 = "IgCpqt3rKV9IqNstF4QwnJlE3hPH+BkIhaOvEmshh0U="; 40 fetchSubmodules = true; 41 }; 42
··· 9 # Please make sure to update this when updating citra! 10 compat-list = fetchurl { 11 name = "citra-compat-list"; 12 + url = "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/"; 13 + hash = "sha256-Ma1SXgzhyMHa/MeoYuf8b+QYPjhoQEeKklLbGbkHwEk="; 14 }; 15 in { 16 nightly = qt6Packages.callPackage ./generic.nix rec { 17 pname = "citra-nightly"; 18 + version = "1963"; 19 20 src = fetchFromGitHub { 21 owner = "citra-emu"; 22 repo = "citra-nightly"; 23 rev = "nightly-${version}"; 24 + sha256 = "0ggi1l8327s43xaxs616g0s9vmal6q7vsv69bn07gp71gchhcmyi"; 25 fetchSubmodules = true; 26 }; 27 ··· 30 31 canary = qt6Packages.callPackage ./generic.nix rec { 32 pname = "citra-canary"; 33 + version = "2573"; 34 35 src = fetchFromGitHub { 36 owner = "citra-emu"; 37 repo = "citra-canary"; 38 rev = "canary-${version}"; 39 + sha256 = "sha256-tQJ3WcqGcnW9dOiwDrBgL0n3UNp1DGQ/FjCR28Xjdpc="; 40 fetchSubmodules = true; 41 }; 42
+11 -3
pkgs/applications/emulators/citra/generic.nix
··· 8 , stdenv 9 , fetchFromGitHub 10 , cmake 11 - , boost179 12 , pkg-config 13 , libusb1 14 , zstd 15 , libressl 16 , enableSdl2 ? true, SDL2 ··· 31 32 nativeBuildInputs = [ 33 cmake 34 pkg-config 35 ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; 36 37 buildInputs = [ 38 - boost179 39 libusb1 40 ] ++ lib.optionals enableQt [ qtbase qtmultimedia ] 41 ++ lib.optional enableSdl2 SDL2 ··· 47 48 cmakeFlags = [ 49 "-DUSE_SYSTEM_BOOST=ON" 50 "-DCITRA_USE_BUNDLED_FFMPEG=OFF" 51 "-DCITRA_USE_BUNDLED_QT=OFF" 52 "-DUSE_SYSTEM_SDL2=ON" ··· 66 ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON" 67 ++ lib.optional enableFdk "-DENABLE_FDK=ON"; 68 69 - postPatch = '' 70 # Fix file not found when looking in var/empty instead of opt 71 mkdir externals/dynarmic/src/dynarmic/ir/var 72 ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty ··· 77 # We already know the submodules are present 78 substituteInPlace CMakeLists.txt \ 79 --replace "check_submodules_present()" "" 80 81 # Devendoring 82 rm -rf externals/zstd externals/libressl
··· 8 , stdenv 9 , fetchFromGitHub 10 , cmake 11 + , boost 12 , pkg-config 13 , libusb1 14 + , glslang 15 , zstd 16 , libressl 17 , enableSdl2 ? true, SDL2 ··· 32 33 nativeBuildInputs = [ 34 cmake 35 + glslang 36 pkg-config 37 ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; 38 39 buildInputs = [ 40 + boost 41 libusb1 42 ] ++ lib.optionals enableQt [ qtbase qtmultimedia ] 43 ++ lib.optional enableSdl2 SDL2 ··· 49 50 cmakeFlags = [ 51 "-DUSE_SYSTEM_BOOST=ON" 52 + "-DCITRA_WARNINGS_AS_ERRORS=OFF" 53 "-DCITRA_USE_BUNDLED_FFMPEG=OFF" 54 "-DCITRA_USE_BUNDLED_QT=OFF" 55 "-DUSE_SYSTEM_SDL2=ON" ··· 69 ++ lib.optional useDiscordRichPresence "-DUSE_DISCORD_PRESENCE=ON" 70 ++ lib.optional enableFdk "-DENABLE_FDK=ON"; 71 72 + postPatch = with lib; let 73 + branchCaptialized = (lib.toUpper (lib.substring 0 1 branch) + lib.substring 1 (-1) branch); 74 + in '' 75 # Fix file not found when looking in var/empty instead of opt 76 mkdir externals/dynarmic/src/dynarmic/ir/var 77 ln -s ../opt externals/dynarmic/src/dynarmic/ir/var/empty ··· 82 # We already know the submodules are present 83 substituteInPlace CMakeLists.txt \ 84 --replace "check_submodules_present()" "" 85 + 86 + # Add versions 87 + echo 'set(BUILD_FULLNAME "${branchCaptialized} ${version}")' >> CMakeModules/GenerateBuildInfo.cmake 88 89 # Devendoring 90 rm -rf externals/zstd externals/libressl
+4 -4
pkgs/applications/emulators/citra/update.sh
··· 44 45 echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" 46 47 - sed -i "s/${OLD_NIGHTLY_VERSION}/${NEW_NIGHTLY_VERSION}/" ./default.nix 48 - sed -i "s/${OLD_NIGHTLY_HASH}/${NEW_NIGHTLY_HASH}/" ./default.nix 49 } 50 51 updateCanary() { ··· 69 70 echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" 71 72 - sed -i "s/${OLD_CANARY_VERSION}/${NEW_CANARY_VERSION}/" ./default.nix 73 - sed -i "s/${OLD_CANARY_HASH}/${NEW_CANARY_HASH}/" ./default.nix 74 } 75 76 if [[ "$BRANCH" = "nightly" ]]; then
··· 44 45 echo " Successfully fetched. hash: ${NEW_NIGHTLY_HASH}" 46 47 + sed -i "s|${OLD_NIGHTLY_VERSION}|${NEW_NIGHTLY_VERSION}|" ./default.nix 48 + sed -i "s|${OLD_NIGHTLY_HASH}|${NEW_NIGHTLY_HASH}|" ./default.nix 49 } 50 51 updateCanary() { ··· 69 70 echo " Successfully fetched. hash: ${NEW_CANARY_HASH}" 71 72 + sed -i "s|${OLD_CANARY_VERSION}|${NEW_CANARY_VERSION}|" ./default.nix 73 + sed -i "s|${OLD_CANARY_HASH}|${NEW_CANARY_HASH}|" ./default.nix 74 } 75 76 if [[ "$BRANCH" = "nightly" ]]; then