public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "cc-wrapper, bintools-wrapper: simply symlink man and info outputs"

Browse Source 
This reverts commit 02c09e0171.
This commit is contained in:
Eelco Dolstra
2018-08-09 12:57:38 +02:00
parent fe68c9d450
commit c981787db9
4 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/build-support/bintools-wrapper/default.nix
+6 -6
View File
@@ -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
''
+ ''