Merge pull request #264325 from kirillrdy/dolphin-emu

dolphin-emu: fix build, use bundled zlib-ng
This commit is contained in:
Weijia Wang
2023-11-02 16:44:14 +01:00
committed by GitHub
@@ -26,7 +26,6 @@
, libXrandr
, lzo
, mbedtls_2
, mgba
, miniupnpc
, minizip-ng
, openal
@@ -38,7 +37,6 @@
, vulkan-loader
, xxHash
, xz
, zlib-ng
# Used in passthru
, common-updater-scripts
@@ -78,6 +76,8 @@ stdenv.mkDerivation rec {
./find-minizip-ng.patch
];
strictDeps = true;
nativeBuildInputs = [
stdenv.cc
cmake
@@ -118,7 +118,6 @@ stdenv.mkDerivation rec {
sfml
xxHash
xz # LibLZMA
zlib-ng
] ++ lib.optionals stdenv.isLinux [
alsa-lib
bluez
@@ -175,6 +174,7 @@ stdenv.mkDerivation rec {
tests.version = testers.testVersion {
package = dolphin-emu;
command = "dolphin-emu-nogui --version";
version = if stdenv.hostPlatform.isDarwin then "Dolphin 5.0" else version;
};
updateScript = writeShellScript "dolphin-update-script" ''