about summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-11-28 17:16:09 -0500
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-12-13 16:08:19 -0500
commit99806c5e12bd02926981ebf2d0b779c683b801ee (patch)
tree1422c56cf6ca788c3e6f7b2198505d85c5aaf013 /pkgs/build-support
parentcebe1b4c08b1d555cbcb4fd8b61a8f28f191a284 (diff)
bintools-wrapper: Create man and info outputs propagated underlying ones
These will be installed if the wrappers are. The wrappers aren't very
good to install, but that's another matter.
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/bintools-wrapper/default.nix13
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index dc157acc6cc28..0dcae204824d5 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
 
   inherit targetPrefix infixSalt;
 
-  outputs = [ "out" "man" ];
+  outputs = [ "out" "info" "man" ];
 
   passthru = {
     inherit bintools libc nativeTools nativeLibc nativePrefix;
@@ -110,7 +110,7 @@ stdenv.mkDerivation {
     ''
       set -u
 
-      mkdir -p $out/bin $out/nix-support $man/nix-support
+      mkdir -p $out/bin {$out,$info,$man}/nix-support
 
       wrap() {
         local dst="$1"
@@ -231,6 +231,15 @@ stdenv.mkDerivation {
       # install the wrapper, you get tools like objdump, the manpages,
       # etc. as well (same for any binaries of libc).
       printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+
+      ##
+      ## Man page and info support
+      ##
+
+      printWords ${bintools.info or ""} \
+        >> $info/nix-support/propagated-build-inputs
+      printWords ${bintools.man or ""} \
+        >> $man/nix-support/propagated-build-inputs
     ''
 
     + ''