Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

pkgs/development/libraries/gobject-introspection/darwin-fixups.patch

@@ -0,0 +1,26 @@
+diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py
+--- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py	2016-02-01 12:25:41.000000000 -0500
++++ gobject-introspection-1.46.0/giscanner/ccompiler.py	2016-02-01 15:50:36.000000000 -0500
+@@ -128,11 +128,7 @@
+                     self.compiler.add_runtime_library_dir('.')
+ 
+                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
+-                args.append('-Wl,-rpath=.')
+-
+-                # Ensure libraries are always linked as we are going to use ldd to work
+-                # out their names later
+-                args.append('-Wl,--no-as-needed')
++                args.append('-Wl,-rpath,.')
+ 
+             for library in libraries:
+                 self.compiler.add_library(library)
+@@ -140,7 +136,7 @@
+                 for library_path in libpaths:
+                     args.append('-L' + library_path)
+                     if os.path.isabs(library_path):
+-                        args.append('-Wl,-rpath=' + library_path)
++                        args.append('-Wl,-rpath,' + library_path)
+ 
+         else:
+             # libtool case: assemble linker command arguments, like we did before
+Only in gobject-introspection-1.46.0/giscanner: ccompiler.py~

pkgs/development/libraries/gobject-introspection/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
-, libintlOrEmpty, autoconf, automake, otool
+, libintlOrEmpty, cctools
 , substituteAll, nixStoreDir ? builtins.storeDir
 }:
 # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
@@ -10,6 +10,7 @@ let
   ver_maj = "1.46";
   ver_min = "0";
 in
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "gobject-introspection-${ver_maj}.${ver_min}";
 
@@ -17,10 +18,6 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
     sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233";
   };
-  patches = stdenv.lib.singleton (substituteAll {
-    src = ./absolute_shlib_path.patch;
-    inherit nixStoreDir;
-  });
 
   outputs = [ "dev" "out" ];
   outputBin = "dev";
@@ -28,23 +25,26 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ flex bison pkgconfig python setupHook/*move .gir*/ ]
     ++ libintlOrEmpty
-    ++ stdenv.lib.optional stdenv.isDarwin otool;
+    ++ stdenv.lib.optional stdenv.isDarwin cctools;
   propagatedBuildInputs = [ libffi glib ];
 
   preConfigure = ''
     sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in
   '';
-  configureFlags = [
-    # Tests depend on cairo, which is undesirable (it pulls in lots of
-    # other dependencies).
-    "--disable-tests"
-  ];
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
 
   setupHook = ./setup-hook.sh;
 
+  patches = stdenv.lib.singleton (substituteAll {
+    src = ./absolute_shlib_path.patch;
+    inherit nixStoreDir;
+  }) ++ optional stdenv.isDarwin (substituteAll {
+    src = ./darwin-fixups.patch;
+    inherit nixStoreDir;
+  });
+
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;

pkgs/development/libraries/gobject-introspection/separate-rpath-arg.patch

@@ -0,0 +1,21 @@
+diff -ur gobject-introspection-1.46.0-orig/giscanner/ccompiler.py gobject-introspection-1.46.0/giscanner/ccompiler.py
+--- gobject-introspection-1.46.0-orig/giscanner/ccompiler.py	2016-02-01 12:25:41.000000000 -0500
++++ gobject-introspection-1.46.0/giscanner/ccompiler.py	2016-02-01 12:26:52.000000000 -0500
+@@ -128,7 +128,7 @@
+                     self.compiler.add_runtime_library_dir('.')
+ 
+                 # https://bugzilla.gnome.org/show_bug.cgi?id=625195
+-                args.append('-Wl,-rpath=.')
++                args.append('-Wl,-rpath,.')
+ 
+                 # Ensure libraries are always linked as we are going to use ldd to work
+                 # out their names later
+@@ -140,7 +140,7 @@
+                 for library_path in libpaths:
+                     args.append('-L' + library_path)
+                     if os.path.isabs(library_path):
+-                        args.append('-Wl,-rpath=' + library_path)
++                        args.append('-Wl,-rpath,' + library_path)
+ 
+         else:
+             # libtool case: assemble linker command arguments, like we did before