Merge remote-tracking branch 'origin/master' into multiple-outputs

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix

pkgs/development/libraries/glib/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconvOrEmpty, zlib, libffi
-, python, pcre, libelf }:
+, python, pcre, libelf, libintlOrEmpty }:
 
 # TODO:
 # * Add gio-module-fam
@@ -24,7 +24,7 @@ let
   '';
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "glib-2.36.1";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
   outputs = [ "dev" "out" "bin" "doc" ];
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ libelf ];
+  buildInputs = [ libelf ] ++ libintlOrEmpty;
 
   nativeBuildInputs = [ perl pkgconfig gettext python ];
 
@@ -43,10 +43,9 @@ stdenv.mkDerivation (rec {
 
   configureFlags = "--with-pcre=system --disable-fam";
 
-  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h" # https://bugzilla.gnome.org/show_bug.cgi?id=698716 :-)
-    + stdenv.lib.optionalString stdenv.isDarwin ''
-      sed '24 i #include <Foundation/Foundation.h>'
-    '';
+  postConfigure = "sed '/SANE_MALLOC_PROTOS/s,^,//,' -i config.h";
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   enableParallelBuilding = true;
 
@@ -55,12 +54,12 @@ stdenv.mkDerivation (rec {
      inherit flattenInclude;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "GLib, a C library of programming buildings blocks";
     homepage    = http://www.gtk.org/;
-    license     = "LGPLv2+";
-    maintainers = with stdenv.lib.maintainers; [ raskin urkud lovek323 ];
-    platforms   = stdenv.lib.platforms.unix;
+    license     = licenses.lgpl2Plus;
+    maintainers = with maintainers; [ lovek323 raskin urkud ];
+    platforms   = platforms.unix;
 
     longDescription = ''
       GLib provides the core application building blocks for libraries
@@ -71,12 +70,3 @@ stdenv.mkDerivation (rec {
   };
 }
 
-//
-
-(stdenv.lib.optionalAttrs stdenv.isDarwin {
-  # XXX: Disable the NeXTstep back-end because stdenv.gcc doesn't support
-  # Objective-C.
-  postConfigure =
-    '' sed -i configure -e's/glib_have_cocoa=yes/glib_have_cocoa=no/g'
-    '';
-}))