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