3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request from wegank/scummvm-darwin

This commit is contained in:
Sandro 2022-12-09 10:14:01 +01:00 committed by GitHub
commit eed4d5c92f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
pkgs
games/scummvm
top-level

View file

@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
postConfigure = ''
sed -i "s/-c -s/-c -s --strip-program=''${STRIP@Q}/" ports.mk
'' + lib.optionalString stdenv.isDarwin ''
substituteInPlace config.mk --replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib
substituteInPlace config.mk \
--replace x86_64-apple-darwin-ranlib ${cctools}/bin/ranlib \
--replace aarch64-apple-darwin-ranlib ${cctools}/bin/ranlib
'';
meta = with lib; {

View file

@ -34736,6 +34736,7 @@ with pkgs;
};
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;
};