From cebe1b4c08b1d555cbcb4fd8b61a8f28f191a284 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 26 Nov 2017 14:46:34 -0500
Subject: [PATCH] darwin binutils: Better handling of man pages and info

---
 pkgs/development/tools/misc/binutils/default.nix | 2 +-
 pkgs/os-specific/darwin/binutils/default.nix     | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 519d5c722af..7628e37ae1c 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     ./disambiguate-arm-targets.patch
   ];
 
-  outputs = [ "out" "info" ];
+  outputs = [ "out" "info" "man" ];
 
   nativeBuildInputs = [ bison buildPackages.stdenv.cc ];
   buildInputs = [ zlib ];
diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index e05d8cf8c43..1fff4915da3 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -17,6 +17,7 @@ in
 # TODO loop over targetPrefixed binaries too
 stdenv.mkDerivation {
   name = "${targetPrefix}cctools-binutils-darwin";
+  outputs = [ "out" "info" "man" ];
   buildCommand = ''
     mkdir -p $out/bin $out/include
 
@@ -37,10 +38,16 @@ stdenv.mkDerivation {
       ln -sf "${cctools}/bin/$i" "$out/bin/$i"
     done
 
-    # FIXME: this will give us incorrect man pages for bits of cctools
     ln -s ${binutils-raw.bintools.out}/share $out/share
 
     ln -s ${cctools}/libexec $out/libexec
+
+    mkdir -p "$info/nix-support" "$man/nix-support"
+    printWords ${binutils-raw.bintools.info} \
+      >> $info/nix-support/propagated-build-inputs
+    # FIXME: cctools missing man pages
+    printWords ${binutils-raw.bintools.man} \
+      >> $man/nix-support/propagated-build-inputs
   '';
 
   passthru = {