Compare commits

...

1 Commits

Author SHA1 Message Date
Domen Kožar
d6972cefa6 Add stdenv.isAarchDarwin 2023-02-10 13:59:50 +00:00
3 changed files with 3 additions and 2 deletions

View File

@@ -59,6 +59,7 @@ rec {
isBSD = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
isDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; };
isAarchDarwin = { kernel = { families = { inherit (kernelFamilies) darwin; }; }; cpu = { family = "arm"; }; };
isUnix = [ isBSD isDarwin isLinux isSunOS isCygwin isRedox ];
isMacOS = { kernel = kernels.macos; };

View File

@@ -145,7 +145,7 @@ let
# Utility flags to test the type of platform.
inherit (hostPlatform)
isDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD
isDarwin isAarchDarwin isLinux isSunOS isCygwin isBSD isFreeBSD isOpenBSD
isi686 isx86_32 isx86_64
is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian;

View File

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