BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scummvm: fix build on darwin

Browse source
This commit is contained in:
Weijia Wang 2023-11-16 22:59:53 +01:00 committed by Peter Hoeg
parent f0e5556c62
commit 6769eec801
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/games/scummvm/default.nix
View file

@ -17,11 +17,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nasm ]; nativeBuildInputs = [ nasm ];
buildInputs = lib.optionals stdenv.isLinux [ buildInputs = lib.optionals stdenv.isLinux [
alsa-lib alsa-lib libGLU libGL
] ++ lib.optionals stdenv.isDarwin [ ] ++ lib.optionals stdenv.isDarwin [
Cocoa AudioToolbox Carbon CoreMIDI AudioUnit 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; dontDisableStatic = true;

1
pkgs/top-level/all-packages.nix
View file

@ -38345,7 +38345,6 @@ with pkgs;
scid-vs-pc = callPackage ../games/scid-vs-pc { }; scid-vs-pc = callPackage ../games/scid-vs-pc { };
scummvm = callPackage ../games/scummvm { scummvm = callPackage ../games/scummvm {
stdenv = if (stdenv.isDarwin && stdenv.isAarch64) then llvmPackages_14.stdenv else stdenv;
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit; inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit;
}; };