From eaa509f33a7058bd819f02a1da32c4ed372e6b49 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 22 May 2017 12:42:03 -0400 Subject: stdenv: Rename `isGNU` to `isHurd` as GNU is a userland Elsewhere, things called GNU indeed includes GNU/Linux or GNU/Hurd, but this predicate was defined excluding Linux regardless of userland. --- pkgs/stdenv/generic/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pkgs/stdenv') diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 0f9c4d7895d1..ceca0432f3ed 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -402,13 +402,10 @@ let # Utility flags to test the type of platform. inherit (hostPlatform) - isDarwin isLinux isSunOS isCygwin isFreeBSD isOpenBSD isi686 isx86_64 - is64bit isMips isBigEndian; + isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD + isi686 isx86_64 is64bit isMips isBigEndian; isArm = hostPlatform.isArm32; isAarch64 = hostPlatform.isArm64; - # Other code instead checks for anything using GNU userland, - # e.g. GNU/linux. This refers just to GNU Hurd. - isGNU = system == "i686-gnu"; # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; -- cgit 1.4.1