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/pango/default.nix

@@ -2,6 +2,8 @@
 , libintlOrEmpty, gobjectIntrospection
 }:
 
+with stdenv.lib;
+
 let
   ver_maj = "1.38";
   ver_min = "1";
@@ -29,6 +31,8 @@ stdenv.mkDerivation rec {
   # .../bin/sh: line 5: 14823 Abort trap: 6 srcdir=. PANGO_RC_FILE=./pangorc ${dir}$tst
   # FAIL: testiter
 
+  configureFlags = optional stdenv.isDarwin "--without-x";
+
   meta = with stdenv.lib; {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";