diff options
| author | Domen Kožar <domen@dev.si> | 2023-02-10 13:59:50 +0000 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2023-02-10 13:59:50 +0000 |
| commit | d6972cefa60a63774d0d8577fa01e4ed28506862 (patch) | |
| tree | ed7aee4220051ecfa6991e09c8f37ec1fd00db14 | |
| parent | Merge pull request #215511 from pennae/nix-lto-jobserver (diff) | |
| download | nixpkgs-origin/isAarchDarwin.tar.gz | |
Add stdenv.isAarchDarwinorigin/isAarchDarwin
| -rw-r--r-- | lib/systems/inspect.nix | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 30615c9fde32..2abace17bcd4 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -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; }; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index cf194be92bd7..fb618cf5aaac 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0132cc4bbc9c..cbacc9f8f074 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; }; |