From 544051b0b0c0b7a78680f65a44e1e75ca0cfdffb Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 11 Oct 2018 19:09:22 +0000 Subject: [PATCH 1/2] coreutils-full: fix cross build --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 582f8d8f05f9..de971cc51ac4 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${buildPackages.coreutils}/share/man/man1/* $out/share/man/man1 + cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal '' From 432c44f6f0f48978f891747b4a62f583f4cf3ae2 Mon Sep 17 00:00:00 2001 From: volth Date: Fri, 12 Oct 2018 10:02:34 +0000 Subject: [PATCH 2/2] coreutils-full: fix cross build (@matthewbauer's version) --- pkgs/tools/misc/coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index de971cc51ac4..fe8d1a8380fc 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { postInstall = optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !minimal) '' rm $out/share/man/man1/* - cp ${if minimal then buildPackages.coreutils else buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 + cp ${buildPackages.coreutils-full}/share/man/man1/* $out/share/man/man1 '' # du: 8.7 M locale + 0.4 M man pages + optionalString minimal ''