1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00

Merge pull request #40154 from obsidiansystems/stdenv-arm-alias

stdenv: Put back isArm, with deprecation notice.
This commit is contained in:
John Ericson 2018-05-08 14:24:58 -04:00 committed by GitHub
commit 5bdfe37daf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -118,6 +118,7 @@ let
inherit (hostPlatform) inherit (hostPlatform)
isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; 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. # Whether we should run paxctl to pax-mark binaries.
needsPax = isLinux; needsPax = isLinux;