Commit 6769eec8 authored by Weijia Wang's avatar Weijia Wang Committed by Peter Hoeg
Browse files

scummvm: fix build on darwin

parent f0e5556c

pkgs/games/scummvm/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -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;















  };