about summary refs log tree commit diff
path: root/pkgs/stdenv/generic
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@yahoo.com>2018-05-08 14:24:58 -0400
committerGitHub <noreply@github.com>2018-05-08 14:24:58 -0400
commit5bdfe37daf05efeb484edd376016db5d50c536b0 (patch)
tree040e0adb2fe393e47c160c018769ed3ba8ace543 /pkgs/stdenv/generic
parent6db7f92cc2af827e8b8b181bf5ed828a1d0f141d (diff)
parent302c4c5f2da82794f2f7fb217a1b977897f852fa (diff)
downloadnixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.tar
nixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.tar.gz
nixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.tar.bz2
nixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.tar.lz
nixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.tar.xz
nixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.tar.zst
nixlib-5bdfe37daf05efeb484edd376016db5d50c536b0.zip
Merge pull request #40154 from obsidiansystems/stdenv-arm-alias
stdenv: Put back isArm, with deprecation notice.
Diffstat (limited to 'pkgs/stdenv/generic')
-rw-r--r--pkgs/stdenv/generic/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 190fc500068c..e9ae54811a21 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -118,6 +118,7 @@ let
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
         isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
+      isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;