From 82110ae6565536e5832ad92e1f6566b4d3b64316 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 27 Aug 2018 14:39:58 -0400 Subject: [PATCH 1/2] stdenv: Better message for deprecated `isArm` The message should say what to do instead. --- pkgs/stdenv/generic/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; From 0a948673f4d66380d7dc522e6641cdeb2e3b99e9 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 31 Aug 2018 16:00:35 -0400 Subject: [PATCH 2/2] libgpg-error: Don't use deprecated `isArm` --- pkgs/development/libraries/libgpg-error/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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