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.
This commit is contained in:
Eelco Dolstra 2012-08-25 21:20:39 -04:00
parent c642f84838
commit 3d32657782
2 changed files with 8 additions and 7 deletions

@ -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";

@ -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 { };