From 70a0580e3807c90f05665d0decae2e7032347f29 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 23 Nov 2017 20:21:32 +0100
Subject: [PATCH 1/5] stdenv: Move devhelp books to outputDevdoc

---
 doc/multiple-output.xml                            | 2 +-
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index a2acc91e55a..2f23da8df01 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -68,7 +68,7 @@
 
       <varlistentry><term><varname>
         $outputDevdoc</varname></term><listitem><para>
-        is for <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc in there.  It goes to <varname>devdoc</varname> or is removed (!) by default.  This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
+        is for <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc and devhelp books in there.  It goes to <varname>devdoc</varname> or is removed (!) by default.  This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
       </para></listitem></varlistentry>
 
       <varlistentry><term><varname>
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 60d4ccf99ed..5e788f31978 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -140,6 +140,7 @@ _multioutDocs() {
     moveToOutput share/info "${!outputInfo}"
     moveToOutput share/doc "${!outputDoc}"
     moveToOutput share/gtk-doc "${!outputDevdoc}"
+    moveToOutput share/devhelp/books "${!outputDevdoc}"
 
     # the default outputMan is in $bin
     moveToOutput share/man "${!outputMan}"

From f15f06c901f0f3bc17ffd2cb04a461fb25923b57 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 24 Nov 2017 02:13:57 +0100
Subject: [PATCH 2/5] gnome2.libglademm: split out devdoc output

---
 pkgs/desktops/gnome-2/bindings/libglademm/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
index 8cf18b7018d..d4813eb2a93 100644
--- a/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
+++ b/pkgs/desktops/gnome-2/bindings/libglademm/default.nix
@@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/libglademm/2.6/${name}.tar.bz2";
     sha256 = "1hrbg9l5qb7w0xvr7013qamkckyj0fqc426c851l69zpmhakqm1q";
   };
-  
+
+  outputs = [ "out" "devdoc" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ intltool ];
   

From 46ee9d4c345e0da0ed513fc96f8fe56661e21d53 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 24 Nov 2017 02:14:13 +0100
Subject: [PATCH 3/5] vala: split out devdoc output

---
 pkgs/development/compilers/vala/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index baf48d7a532..1679407f39c 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -12,6 +12,8 @@ let
       inherit sha256;
     };
 
+    outputs = [ "out" "devdoc" ];
+
     nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs;
 
     buildInputs = [ glib libiconv ] ++ libintlOrEmpty ++ extraBuildInputs;

From c151a86dbc72d665d518e6d78717d95da081b2e5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 24 Nov 2017 02:14:32 +0100
Subject: [PATCH 4/5] libxmlxx: split out devdoc output

---
 pkgs/development/libraries/libxmlxx/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 23b36db8fe1..226fe5be536 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a";
   };
 
+  outputs = [ "out" "devdoc" ];
+
   nativeBuildInputs = [ pkgconfig perl ];
 
   propagatedBuildInputs = [ libxml2 glibmm ];

From 2bffd5f45fdbd346fa288d30b544860387a10783 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 24 Nov 2017 02:14:46 +0100
Subject: [PATCH 5/5] libxmlxx3: split out devdoc output

---
 pkgs/development/libraries/libxmlxx/v3.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix
index 646fdfbac4f..5e1e947b8f7 100644
--- a/pkgs/development/libraries/libxmlxx/v3.nix
+++ b/pkgs/development/libraries/libxmlxx/v3.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "19kik79fmg61nv0by0a5f9wchrcfjwzvih4v2waw01hqflhqvp0r";
   };
 
+  outputs = [ "out" "devdoc" ];
+
   nativeBuildInputs = [ pkgconfig perl ];
 
   buildInputs = [ glibmm ];