diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-12-02 00:24:15 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-12-04 18:21:02 +0200 |
| commit | 659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f (patch) | |
| tree | 341c3426d17c2a507bb668d8b799c88fe8d018a0 /pkgs/tools/misc | |
| parent | 9ccc14b1bc1d7714e908d79f37785c5b80f045dc (diff) | |
| download | nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.tar nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.tar.gz nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.tar.bz2 nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.tar.lz nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.tar.xz nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.tar.zst nixlib-659f75bfcdc8c623b1eabdf55fa2a01cc3f0d79f.zip | |
coreutils-prefixed: Fix build since the single-binary changes
With the symlinked build it's only renaming 'coreutils' to 'gcoreutils' and leaving all the actual command symlinks alone. Instead of custom renaming scripts, let's use --program-prefix from the autotools kitchen sink. This has the nice(?) bonus that the manpages also get prefixed with 'g' now. The build system refuses to enable both single-binary build and --program-prefix - but the symlink-based single-binary build couldn't possibly work either (as it will be looking at "$0" for which command to execute).
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 12 |
1 files changed, 3 insertions, 9 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/; |