From 3d32657782a2971e29823027f01a2333166d834f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Aug 2012 21:20:39 -0400
Subject: [PATCH] Split glib

In particular, moving the bin subdirectory to a separate output
ensures that the library proper no longer depends on Python and Perl.

The closure of PulseAudio is now down from 325 MiB to 155 MiB.
---
 pkgs/development/libraries/glib/2.30.x.nix | 11 +++++------
 pkgs/top-level/all-packages.nix            |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix
index 72baf0154d9..444259ef274 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/pkgs/development/libraries/glib/2.30.x.nix
@@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
   };
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ pcre ]
-    ++ (if libiconvOrNull != null
-        then [ libiconvOrNull ]
-        else []);
+  buildInputs = [ pcre ] ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull;
 
   buildNativeInputs = [ perl pkgconfig gettext python ];
 
@@ -33,8 +34,6 @@ stdenv.mkDerivation rec {
 
   passthru.gioModuleDir = "lib/gio/modules";
 
-  postInstall = ''rm -rvf $out/share/gtk-doc'';
-
   meta = {
     description = "GLib, a C library of programming buildings blocks";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ce10d7101b..4f63949580c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3791,7 +3791,9 @@ let
       gtkmm;
   };
 
-  glib = callPackage ../development/libraries/glib/2.30.x.nix { };
+  glib = callPackage ../development/libraries/glib/2.30.x.nix {
+    stdenv = stdenvMulti;
+  };
 
   glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };