From 19d22184d3b1b74be5ecb9eb5c9a1630c9dd4b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 11:18:27 +0100
Subject: [PATCH] stdenv/multiple-outputs.sh: small tweaks

- fix in silencing some moveToOutput messages
- allow removing (developer) documentation even without defining outputs
  (note: some paths are auto-removed by default, e.g. gtk-doc and man3)
---
 pkgs/build-support/setup-hooks/multiple-outputs.sh       | 3 +--
 pkgs/development/tools/documentation/gtk-doc/default.nix | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ad2e5253ea07..2cf08d42ae04 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -106,7 +106,7 @@ moveToOutput() {
             if rmdir "$srcParent"; then
                 echo "Removing empty $srcParent/ and (possibly) its parents"
                 rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \
-                    > /dev/null || true # doesn't ignore failure for some reason
+                    2> /dev/null || true # doesn't ignore failure for some reason
             fi
         done
     done
@@ -114,7 +114,6 @@ moveToOutput() {
 
 # Move documentation to the desired outputs.
 _multioutDocs() {
-    if [ "$outputs" = "out" ]; then return; fi;
     local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo}
 
     moveToOutput share/info "${!outputInfo}"
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 6d93dc6def00..22a0278384af 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l";
   };
 
+  outputDocdev = "out";
+
   # maybe there is a better way to pass the needed dtd and xsl files
   # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
   preConfigure = ''