diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-02 16:44:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-02 16:44:14 +0100 |
commit | 75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3 (patch) | |
tree | 6d11848f89667acc8d942dea8bbd8b21e54f5e89 | |
parent | 6b47bd453c8a9f78e17aced0e604b78d002b3c4e (diff) | |
parent | 72052b6f3e206a811f309da6a61b020d4c0d5d84 (diff) | |
download | nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.tar nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.tar.gz nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.tar.bz2 nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.tar.lz nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.tar.xz nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.tar.zst nixpkgs-75d9610e7360f03d8d5b7c5d49c7aa90753b0ca3.zip |
Merge pull request #264325 from kirillrdy/dolphin-emu
dolphin-emu: fix build, use bundled zlib-ng
-rw-r--r-- | pkgs/applications/emulators/dolphin-emu/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/applications/emulators/dolphin-emu/default.nix index 6e3f93701c0..664399f7573 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/applications/emulators/dolphin-emu/default.nix @@ -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" '' |