Merge branch 'origin/master' into stdenv-updates.

pkgs/development/libraries/glibc/2.17/common.nix

@@ -8,6 +8,7 @@ cross:
 , machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
 , mig ? null
 , profilingLibraries ? false, meta
+, withGd ? false, gd ? null, libpng ? null
 , preConfigure ? "", ... }@args:
 
 let
@@ -108,12 +109,13 @@ stdenv.mkDerivation ({
       # To avoid linking with -lgcc_s (dynamic link)
       # so the glibc does not depend on its compiler store path
       "libc_cv_as_needed=no"
-    ];
+    ] ++ stdenv.lib.optional withGd "--with-gd";
 
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
   buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
-    ++ stdenv.lib.optional (mig != null) mig;
+    ++ stdenv.lib.optional (mig != null) mig
+    ++ stdenv.lib.optionals withGd [ gd libpng ];
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
   # prevent a retained dependency on the bootstrap tools in the stdenv-linux
@@ -130,7 +132,7 @@ stdenv.mkDerivation ({
 
 # Remove the `gccCross' attribute so that the *native* glibc store path
 # doesn't depend on whether `gccCross' is null or not.
-// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" ]) //
+// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" "withGd" "gd" "libpng" ]) //
 
 {
   name = name + "-${version}" +
@@ -193,6 +195,10 @@ stdenv.mkDerivation ({
   } // meta;
 }
 
+// stdenv.lib.optionalAttrs withGd {
+  preBuild = "unset NIX_DONT_SET_RPATH";
+}
+
 // stdenv.lib.optionalAttrs (hurdHeaders != null) {
   # Work around the fact that the configure snippet that looks for
   # <hurd/version.h> does not honor `--with-headers=$sysheaders' and that

pkgs/development/libraries/glibc/2.17/default.nix

@@ -5,6 +5,7 @@
 , profilingLibraries ? false
 , gccCross ? null
 , debugSymbols ? false
+, withGd ? false, gd ? null, libpng ? null
 }:
 
 assert stdenv.gcc.gcc != null;
@@ -16,10 +17,11 @@ in
   build cross ({
     name = "glibc"
       + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
-      + stdenv.lib.optionalString debugSymbols "-debug";
+      + stdenv.lib.optionalString debugSymbols "-debug"
+      + stdenv.lib.optionalString withGd "-gd";
 
     inherit fetchurl fetchgit stdenv kernelHeaders installLocales
-      profilingLibraries gccCross;
+      profilingLibraries gccCross withGd gd libpng;
 
     builder = ./builder.sh;