From 590eec7945f7718c9f9ea96ad0828624a7e7c190 Mon Sep 17 00:00:00 2001 From: Danny Wilson Date: Tue, 17 Nov 2015 18:28:51 +0100 Subject: Simplify FORCE_UNSAFE_CONFIGURE by making it an optional string. postInstall references ${self} and requires self to be a derivation. --- pkgs/tools/misc/coreutils/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgs/tools/misc/coreutils') diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 9f763115f9a9f..c9aacd0ba6b8e 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -11,7 +11,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; let - self = rec { + self = stdenv.mkDerivation rec { name = "coreutils-8.24"; src = fetchurl { @@ -82,6 +82,7 @@ let enableParallelBuilding = false; NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; + FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1"; makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; @@ -104,7 +105,4 @@ let }; }; in - stdenv.mkDerivation (self - // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { - FORCE_UNSAFE_CONFIGURE = 1; - }) + self; -- cgit 1.4.1