summary refs log tree commit diff
path: root/pkgs/stdenv/generic/default.nix
diff options
context:
space:
mode:
authorParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 05:54:01 -0600
committerParnell Springmeyer <parnell@digitalmentat.com>2017-01-29 05:54:01 -0600
commit6777e6f812913f0213b71392bf2499a3e49b8dee (patch)
tree1870777ba0d1ba0be8a66fd94d6c070b62729cdf /pkgs/stdenv/generic/default.nix
parentc5f1f9a3b5bcf5d2990aba0ab086767d1d384922 (diff)
parent82bcfef109ecf58ac1503e4cab15ae53dd524f4b (diff)
downloadnixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar
nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.gz
nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.bz2
nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.lz
nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.xz
nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.zst
nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.zip
Merging with upstream
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
-rw-r--r--pkgs/stdenv/generic/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 269d7ef893a..2010e35f58a 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -311,6 +311,7 @@ let
              || system == "armv5tel-linux"
              || system == "armv6l-linux"
              || system == "armv7l-linux"
+             || system == "aarch64-linux"
              || system == "mips64el-linux";
       isGNU = system == "i686-gnu"; # GNU/Hurd
       isGlibc = isGNU # useful for `stdenvNative'
@@ -348,6 +349,7 @@ let
       isArm = system == "armv5tel-linux"
            || system == "armv6l-linux"
            || system == "armv7l-linux";
+      isAarch64 = system == "aarch64-linux";
       isBigEndian = system == "powerpc-linux";
 
       # Whether we should run paxctl to pax-mark binaries.