diff options
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index e1d9bb921fd9..8f09a677b8e9 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -39,7 +39,8 @@ let configureFlags = optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") - ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"; + ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no" + ++ optional withPrefix "--program-prefix=g"; buildInputs = [ gmp ] ++ optional aclSupport acl @@ -89,14 +90,7 @@ let makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - # e.g. ls -> gls; grep -> ggrep - postFixup = optionalString withPrefix - '' - ( - cd "$out/bin" - find * -type f -executable -exec mv {} g{} \; - ) - ''; + postFixup = ""; # FIXME: remove on next mass rebuild meta = { homepage = http://www.gnu.org/software/coreutils/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 887a2018e910..78a8c9ac6579 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1286,7 +1286,7 @@ in aclSupport = stdenv.isLinux; }; - coreutils-prefixed = coreutils.override { withPrefix = true; }; + coreutils-prefixed = coreutils.override { withPrefix = true; singleBinary = false; }; corkscrew = callPackage ../tools/networking/corkscrew { }; |