diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-09-14 14:56:10 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-14 14:56:10 +0200 |
commit | 961c2fe7c3cb5410b747c258bc29328c0433a264 (patch) | |
tree | 3be04386115acdc25570b548517f8191ef1b9800 /pkgs/tools/misc/coreutils | |
parent | 055e646bfc1fc0b06ac61ee88f1d31b1698f287f (diff) | |
download | nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.tar nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.tar.gz nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.tar.bz2 nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.tar.lz nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.tar.xz nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.tar.zst nixlib-961c2fe7c3cb5410b747c258bc29328c0433a264.zip |
coreutils,gettext: don't change hash except for darwin
Also some style cleanup. Note that defining an empty-string variable *does* change the hash. I would like to change this behaviour one day (clean up attrs when compiling the derivation).
Diffstat (limited to 'pkgs/tools/misc/coreutils')
-rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c4066c89d1d7..65a3bec555ef 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -6,8 +6,11 @@ assert aclSupport -> acl != null; assert selinuxSupport -> libselinux != null && libsepol != null; + +with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; + let - self = stdenv.mkDerivation rec { + self = stdenv.mkDerivation (rec { name = "coreutils-8.21"; src = fetchurl { @@ -17,16 +20,14 @@ let nativeBuildInputs = [ perl ]; buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl - ++ stdenv.lib.optional selinuxSupport libselinux - ++ stdenv.lib.optional selinuxSupport libsepol; + ++ optional aclSupport acl + ++ optionals selinuxSupport [ libselinux libsepol ]; crossAttrs = { buildInputs = [ gmp ] - ++ stdenv.lib.optional aclSupport acl.crossDrv - ++ stdenv.lib.optional selinuxSupport libselinux.crossDrv - ++ stdenv.lib.optional selinuxSupport libsepol.crossDrv - ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) + ++ optional aclSupport acl.crossDrv + ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] + ++ optional (stdenv.gccCross.libc ? libiconv) stdenv.gccCross.libc.libiconv.crossDrv; buildPhase = '' @@ -57,10 +58,7 @@ let enableParallelBuilding = true; - NIX_LDFLAGS = stdenv.lib.optionalString selinuxSupport "-lsepol"; - - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CFLAGS=-D_FORTIFY_SOURCE=0"; + NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; meta = { homepage = http://www.gnu.org/software/coreutils/; @@ -77,6 +75,8 @@ let maintainers = [ ]; }; - }; + } // optionalAttrs stdenv.isDarwin { + makeFlags = "CFLAGS=-D_FORTIFY_SOURCE=0"; + }); in self |