diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-05-09 10:48:01 +0200 |
| commit | a18b493e022a4d94916b2d73198b29ff1a241114 (patch) | |
| tree | e6f69c279e63f753e958773e854caeb934ac770c /pkgs/stdenv/generic | |
| parent | 8ff2dca3884b99799d90e0a025de59552161eebf (diff) | |
| parent | 70963b382f3f820ba6d3bc3b3aaf50a2957ec1ff (diff) | |
| download | nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.gz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.bz2 nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.lz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.xz nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.tar.zst nixlib-a18b493e022a4d94916b2d73198b29ff1a241114.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 1 |
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; |