Skip to content

Commit 0a5eb20

Browse files
authored
azahar: 2120.3 -> 2121.1 (#405749)
2 parents 5738e65 + 6d4b354 commit 0a5eb20

1 file changed

Lines changed: 12 additions & 23 deletions

File tree

pkgs/by-name/az/azahar/package.nix

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,15 @@
2727
pipewire,
2828
pkg-config,
2929
portaudio,
30+
SDL2,
3031
sndio,
3132
spirv-tools,
3233
soundtouch,
3334
stdenv,
3435
vulkan-headers,
3536
xorg,
3637
zstd,
37-
enableSDL2 ? true,
38-
SDL2,
39-
enableQt ? true,
40-
enableQtTranslations ? enableQt,
38+
enableQtTranslations ? true,
4139
qt6,
4240
enableCubeb ? true,
4341
cubeb,
@@ -53,20 +51,19 @@ let
5351
in
5452
stdenv.mkDerivation (finalAttrs: {
5553
pname = "azahar";
56-
version = "2120.3";
54+
version = "2121.1";
5755

5856
src = fetchzip {
59-
# TODO: use this when https://github.com/azahar-emu/azahar/issues/779 is resolved
60-
# url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/lime3ds-unified-source-${finalAttrs.version}.tar.xz";
61-
url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-20250414-00e3bbb.tar.xz";
62-
hash = "sha256-3QKicmpmWDM7x9GDJ8sxm2Xu+0Yfho4LkSWMp+ixzRk=";
57+
url = "https://github.com/azahar-emu/azahar/releases/download/${finalAttrs.version}/azahar-unified-source-${finalAttrs.version}.tar.xz";
58+
hash = "sha256-jadQsuU1SfvUc5DO5XqZXTe53U9XGOHScDGx66Oh18Q=";
6359
};
6460

6561
nativeBuildInputs = [
6662
cmake
6763
doxygen
6864
pkg-config
69-
] ++ lib.optionals enableQt [ qt6.wrapQtAppsHook ];
65+
qt6.wrapQtAppsHook
66+
];
7067

7168
buildInputs =
7269
[
@@ -91,25 +88,20 @@ stdenv.mkDerivation (finalAttrs: {
9188
openssl
9289
pipewire
9390
portaudio
91+
qt6.qtbase
92+
qt6.qtmultimedia
93+
qt6.qttools
94+
qt6.qtwayland
9495
soundtouch
96+
SDL2
9597
sndio
9698
spirv-tools
9799
vulkan-headers
98100
xorg.libX11
99101
xorg.libXext
100102
zstd
101103
]
102-
++ optionals enableQt (
103-
with qt6;
104-
[
105-
qtbase
106-
qtmultimedia
107-
qttools
108-
qtwayland
109-
]
110-
)
111104
++ optionals enableQtTranslations [ qt6.qttools ]
112-
++ optionals enableSDL2 [ SDL2 ]
113105
++ optionals enableCubeb [ cubeb ]
114106
++ optionals useDiscordRichPresence [ rapidjson ];
115107

@@ -147,10 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
147139
(cmakeBool "DISABLE_SYSTEM_LODEPNG" true)
148140
(cmakeBool "DISABLE_SYSTEM_VMA" true)
149141
(cmakeBool "DISABLE_SYSTEM_XBYAK" true)
150-
(cmakeBool "ENABLE_QT" enableQt)
151142
(cmakeBool "ENABLE_QT_TRANSLATION" enableQtTranslations)
152-
(cmakeBool "ENABLE_SDL2" enableSDL2)
153-
(cmakeBool "ENABLE_SDL2_FRONTEND" enableSDL2)
154143
(cmakeBool "ENABLE_CUBEB" enableCubeb)
155144
(cmakeBool "USE_DISCORD_PRESENCE" useDiscordRichPresence)
156145
];

0 commit comments

Comments
 (0)