diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-23 17:45:27 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-30 10:09:31 -0400 |
| commit | 95c8277701fb746ad4d91841de494ee869886991 (patch) | |
| tree | 120ec8dad2d1a6d1c678f3d51778328f5ad2a110 /pkgs/tools/misc | |
| parent | d61c22341b00171b53697164cb8241184979d14c (diff) | |
| download | nixlib-95c8277701fb746ad4d91841de494ee869886991.tar nixlib-95c8277701fb746ad4d91841de494ee869886991.tar.gz nixlib-95c8277701fb746ad4d91841de494ee869886991.tar.bz2 nixlib-95c8277701fb746ad4d91841de494ee869886991.tar.lz nixlib-95c8277701fb746ad4d91841de494ee869886991.tar.xz nixlib-95c8277701fb746ad4d91841de494ee869886991.tar.zst nixlib-95c8277701fb746ad4d91841de494ee869886991.zip | |
misc pkgs: Remove unneeded *Platform == *Platform comparisons
PR #26007 used these to avoid causing a mass rebuild. Now that we know things work, we do that to clean up.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 42f8e74df313..9a988a2b4311 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { && builtins.storeDir == "/nix/store"; # Prevents attempts of running 'help2man' on cross-built binaries. - ${if hostPlatform == buildPlatform then null else "PERL"} = "missing"; + PERL = if hostPlatform == buildPlatform then null else "missing"; # Saw random failures like ‘help2man: can't get '--help' info from # man/sha512sum.td/sha512sum’. @@ -83,11 +83,11 @@ stdenv.mkDerivation rec { # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. - ${if hostPlatform == buildPlatform then null else "preInstall"} = '' + preInstall = optionalString (hostPlatform != buildPlatform) '' sed -i Makefile -e 's|^INSTALL =.*|INSTALL = ${buildPackages.coreutils}/bin/install -c|' ''; - ${if hostPlatform == buildPlatform then null else "postInstall"} = '' + postInstall = optionalString (hostPlatform != buildPlatform) '' rm $out/share/man/man1/* cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 ''; |