diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-04 19:36:39 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-04 19:36:39 +0200 |
| commit | 23741692fabcdfee9a8b7f89576236a69d4d4d8a (patch) | |
| tree | b3d53e3f97547c93bba340176bee375cb720ebdc /pkgs/development/libraries/webkitgtk | |
| parent | d051989efa7354384271bb21c5f471cfc05c1541 (diff) | |
| parent | b9484875bcc1918945d373e0ea46ffff938adb05 (diff) | |
| download | nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.gz nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.bz2 nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.lz nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.xz nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.tar.zst nixpkgs-23741692fabcdfee9a8b7f89576236a69d4d4d8a.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/development/libraries/webkitgtk')
| -rw-r--r-- | pkgs/development/libraries/webkitgtk/2.20.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix index 47144bee83a..27524504872 100644 --- 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" |