diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-16 22:59:53 +0100 |
---|---|---|
committer | Peter Hoeg <peter@hoeg.com> | 2023-11-17 10:44:45 +0100 |
commit | 6769eec801ed1c10b0ed3b7541e693161a8b7c26 (patch) | |
tree | ddcc45d7695e791925bfe25ed9bc46a3c37868ff | |
parent | f0e5556c62a9b2bfd506e174c0f664b2afb6918e (diff) |
scummvm: fix build on darwin
-rw-r--r-- | pkgs/games/scummvm/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 85ef0766b8e8f..923b69d31cfa0 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.isLinux [ - alsa-lib + alsa-lib libGLU libGL ] ++ lib.optionals stdenv.isDarwin [ Cocoa AudioToolbox Carbon CoreMIDI AudioUnit ] ++ [ - curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis libGLU libGL SDL2 zlib + curl freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libtheora libvorbis SDL2 zlib ]; dontDisableStatic = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bca8878d743af..3712806cf012a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -38345,7 +38345,6 @@ with pkgs; scid-vs-pc = callPackage ../games/scid-vs-pc { }; scummvm = callPackage ../games/scummvm { - stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv; inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; }; |