Unverified Commit 75d9610e authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #264325 from kirillrdy/dolphin-emu 

dolphin-emu: fix build, use bundled zlib-ng
parents 6b47bd45 72052b6f

pkgs/applications/emulators/dolphin-emu/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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" ''