Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

pkgs/development/libraries/webkitgtk/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
+{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake
 , pkgconfig, gettext, gobjectIntrospection, libnotify
 , gtk2, gtk3, wayland, libwebp, enchant
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "http://webkitgtk.org/";
     license = licenses.bsd2;
     platforms = platforms.linux;
+    hydraPlatforms = [];
     maintainers = with maintainers; [ iyzsong koral ];
   };
 
@@ -28,7 +29,14 @@ stdenv.mkDerivation rec {
     sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
   };
 
-  patches = [ ./finding-harfbuzz-icu.patch ];
+  patches = [ ./finding-harfbuzz-icu.patch
+    (fetchpatch {
+      name = "glibc-isnan.patch";
+      url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore"
+        + "/runtime/Options.cpp?format=diff&new=194518";
+      sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm";
+    })
+  ];
 
   cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];