From a951f11021c547421691a52bc01da4e6d35efa62 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Jul 2015 13:43:49 +0200
Subject: [PATCH] Move some more gtk-docs to the doc output

---
 pkgs/desktops/gnome-2/platform/GConf/default.nix      | 4 +++-
 pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix  | 2 ++
 pkgs/development/compilers/orc/default.nix            | 2 ++
 pkgs/development/libraries/at-spi2-core/default.nix   | 2 ++
 pkgs/development/libraries/dbus-glib/default.nix      | 2 ++
 pkgs/development/libraries/harfbuzz/default.nix       | 2 ++
 pkgs/development/libraries/libsoup/default.nix        | 2 ++
 pkgs/development/libraries/poppler/default.nix        | 2 ++
 pkgs/development/python-modules/pygobject/default.nix | 2 ++
 pkgs/os-specific/linux/udisks/2-default.nix           | 2 ++
 10 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index d4a8e1ff8469..db51a5f8962a 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -4,13 +4,15 @@
 assert withGtk -> (gtk != null);
 
 stdenv.mkDerivation {
-  name = "GConf-2.32.4";
+  name = "gconf-2.32.4";
 
   src = fetchurl {
     url = mirror://gnome/sources/GConf/2.32/GConf-2.32.4.tar.xz;
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on
     # darwin
diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
index 1875c1491f96..e8ddf7096e62 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
   buildInputs = [ pkgconfig libxml2 glib ];
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 1c1b5d53cee9..3b8916c67e90 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
   };
 
+  outputs = [ "out" "doc" ];
+
   # building memcpy_speed.log
   # ../test-driver: line 107:  4495 Segmentation fault      "$@" > $log_file 2>&1
   # FAIL: memcpy_speed
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index a3632bc13fdf..0fc28185501a 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "1l3l39mw23zyjlcqidvkyqlr4gwbhplzw2hcv3qvn6p8ikxpf2qw";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [
     python pkgconfig popt  intltool dbus_glib
     libX11 xextproto libSM libICE libXtst libXi
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 00b302bde8d5..480dc61897bb 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ pkgconfig gettext ];
 
   buildInputs = [ expat libiconv ];
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 216bad19790e..bac9edd5c2e6 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0z05vj3va43adzxn026fpdvdd533q5zrs5dcxaz3gd021hysa6nq";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = [
     ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
     ( "--with-icu=" +       (if withIcu       then "yes" else "no") )
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 82629ca3c6fa..8ad158aafb75 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation {
     sha256 = "ea34dd64fe44343445daf6dd690d0691e9d973468de44878da97371c16d89784";
   };
 
+  outputs = [ "out" "doc" ];
+
   patchPhase = ''
     patchShebangs libsoup/
     patch -p1 < ${./bad-symbol.patch}
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index f54f12031b44..ce63f5c9716e 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  outputs = [ "out" "doc" ];
+
   patches = [ ./datadir_env.patch ];
 
   propagatedBuildInputs = with stdenv.lib;
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 9393b0a2f94e..6f7139330407 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
+  outputs = [ "out" "doc" ];
+
   configureFlags = "--disable-introspection";
 
   buildInputs = [ python pkgconfig glib ];
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 9b7a7501629b..76d6caa767c6 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0spl155k0g2l2hvqf8xyjv08i68gfyhzpjva6cwlzxx0bz4gbify";
   };
 
+  outputs = [ "out" "doc" ];
+
   patches = [ ./force-path.patch ];
 
   # FIXME remove /var/run/current-system/sw/* references