Merge master into staging

2018-04-04 19:36:39 +02:00
parent d051989efa b9484875bc
commit 23741692fa
121 changed files with 2824 additions and 3507 deletions
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -39,6 +39,12 @@ stdenv.mkDerivation rec {
    patchShebangs .
  '';

+  postConfigure = ''
+    # A stopgap for a non-deterministic build failure when using only one core
+    # Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=183788#c4
+    ninja JavaScriptCoreForwardingHeaders WTFForwardingHeaders
+  '';
+
  cmakeFlags = [
  "-DPORT=GTK"
  "-DUSE_LIBHYPHEN=0"