diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-28 09:48:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-28 09:54:22 +0200 |
| commit | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (patch) | |
| tree | bc1c1407e82b104c93bf1ec5256c47c1472128aa /pkgs/tools | |
| parent | 19e80fa19d01fb0f15d6b99c860c7a9b0de264b2 (diff) | |
| download | nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.tar nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.tar.gz nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.tar.bz2 nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.tar.lz nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.tar.xz nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.tar.zst nixpkgs-f4792cdc0cffc0d1843f5d8bb3e458546646f67c.zip | |
make-bootstrap-tools*: fixup after #16406
Our coreutils now uses single-binary-build mode where, by default, simple shebang scripts are used for all the binaries. That doesn't work e.g. with the Linux unpacker which only handles standard binaries and symlinks. Let's use the symlinked mode instead for boostrapping. This does NOT change any stdenv hashes. I only tested the case most important to me: $ nix-build pkgs/top-level/release.nix -A stdenvBootstrapTools.x86_64-linux.test
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index d08dd303341..4ed43a18988 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -3,6 +3,7 @@ , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo , withPrefix ? false +, singleBinary ? true # you can also pass "symlinks", for example }: assert aclSupport -> acl != null; @@ -30,7 +31,9 @@ let outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = [ "--enable-single-binary" ] + configureFlags = + optional (singleBinary != false) + ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"; buildInputs = [ gmp ] |