diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-08-09 12:57:38 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-08-09 12:57:38 +0200 |
| commit | c981787db951afb11c1328461df82d4277ebec07 (patch) | |
| tree | 436518964b31c4428e8b7abe84edf310fcfba40a /pkgs/build-support/bintools-wrapper | |
| parent | fe68c9d45026857c330d2c8dda8e6fbea23a6cee (diff) | |
| download | nixlib-c981787db951afb11c1328461df82d4277ebec07.tar nixlib-c981787db951afb11c1328461df82d4277ebec07.tar.gz nixlib-c981787db951afb11c1328461df82d4277ebec07.tar.bz2 nixlib-c981787db951afb11c1328461df82d4277ebec07.tar.lz nixlib-c981787db951afb11c1328461df82d4277ebec07.tar.xz nixlib-c981787db951afb11c1328461df82d4277ebec07.tar.zst nixlib-c981787db951afb11c1328461df82d4277ebec07.zip | |
Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"
This reverts commit 02c09e01712ce0b61e5c8f7159047699a434f7fc.
Diffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 7cbe56bdd651..2048220361ac 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -6,10 +6,9 @@ # compiler and the linker just "work". { name ? "" -, stdenvNoCC -, bintools ? null, libc ? null, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null -, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, propagateDoc ? !nativeTools && bintools != null && bintools ? man +, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" +, bintools ? null, libc ? null +, coreutils ? null, shell ? stdenvNoCC.shell, gnugrep ? null , extraPackages ? [], extraBuildCommands ? "" , buildPackages ? {} , useMacosReexportHack ? false @@ -268,8 +267,9 @@ stdenv.mkDerivation { ## Man page and info support ## - ln -s ${bintools.man} $man - ln -s ${bintools.info} $info + mkdir -p $man/nix-support $info/nix-support + printWords ${bintools.man or ""} >> $man/nix-support/propagated-build-inputs + printWords ${bintools.info or ""} >> $info/nix-support/propagated-build-inputs '' + '' |