diff options
| author | John Ericson <mail@JohnEricson.me> | 2018-08-31 16:21:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-31 16:21:46 -0400 |
| commit | 4663cd2b3b2f64210f61265068c294a21b70f5ee (patch) | |
| tree | 8626d321f6cd6c4670eae021aae3bdfaaf516d3f /pkgs | |
| parent | 1a1d544eac923eaff73c238181f213b1315b5da1 (diff) | |
| parent | 0a948673f4d66380d7dc522e6641cdeb2e3b99e9 (diff) | |
| download | nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.tar nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.tar.gz nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.tar.bz2 nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.tar.lz nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.tar.xz nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.tar.zst nixpkgs-4663cd2b3b2f64210f61265068c294a21b70f5ee.zip | |
Merge pull request #45884 from obsidiansystems/improve-isArm-msg
stdenv: Better message for deprecated `isArm`
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/libgpg-error/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index ccac20c9077..9d1427f7f45 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation (rec { postPatch = '' sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure - '' + lib.optionalString (stdenv.hostPlatform.isArm && stdenv.buildPlatform != stdenv.hostPlatform ) '' + '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h '' + lib.optionalString stdenv.hostPlatform.isMusl '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index c661b2e1e4c..f5da7880710 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -123,7 +123,9 @@ let inherit (hostPlatform) isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian; - isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm; + isArm = builtins.trace + "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" + hostPlatform.isAarch32; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; |