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 | |
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.
-rw-r--r-- | pkgs/build-support/bintools-wrapper/default.nix | 12 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 9 | ||||
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 1 | ||||
-rw-r--r-- | pkgs/stdenv/linux/default.nix | 1 |
4 files changed, 12 insertions, 11 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 '' + '' diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8928d1643c83..b9828c941ed2 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -6,10 +6,8 @@ # compiler and the linker just "work". { name ? "" -, stdenvNoCC +, stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell -, nativeTools, noLibc ? false, nativeLibc, nativePrefix ? "" -, propagateDoc ? !nativeTools && cc != null && cc ? man , extraPackages ? [], extraBuildCommands ? "" , isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null , buildPackages ? {} @@ -263,8 +261,9 @@ stdenv.mkDerivation { ## Man page and info support ## - ln -s ${cc.man} $man - ln -s ${cc.info} $info + mkdir -p $man/nix-support $info/nix-support + printWords ${cc.man or ""} >> $man/nix-support/propagated-build-inputs + printWords ${cc.info or ""} >> $info/nix-support/propagated-build-inputs '' + '' diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9b792b862b1e..22dd700b2dda 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -88,6 +88,7 @@ in rec { extraPackages = lib.optional (libcxx != null) libcxx; nativeTools = false; + propagateDoc = false; nativeLibc = false; inherit buildPackages coreutils gnugrep bintools; libc = last.pkgs.darwin.Libsystem; diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 329ce6066be2..ef46bdeb2133 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -90,6 +90,7 @@ let else lib.makeOverridable (import ../../build-support/cc-wrapper) { name = "${name}-gcc-wrapper"; nativeTools = false; + propagateDoc = false; nativeLibc = false; buildPackages = lib.optionalAttrs (prevStage ? stdenv) { inherit (prevStage) stdenv; |