diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-07-01 14:36:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-07-01 14:37:30 +0200 |
| commit | df1d27ac31f71281c7745e12e3d32c79db351061 (patch) | |
| tree | 1db47360be5811eae1e84b9c1c25cdefe6509cf8 /pkgs | |
| parent | 5fa05a42a1828e31c36ffa2bd7ad515bdc515839 (diff) | |
| download | nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.tar nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.tar.gz nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.tar.bz2 nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.tar.lz nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.tar.xz nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.tar.zst nixlib-df1d27ac31f71281c7745e12e3d32c79db351061.zip | |
firefox: fix highly parallel make by upstream patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 6e39904d27ba..29b12c9fec09 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,7 +94,14 @@ let browserPatches = [ ./env_var_for_system_dir.patch - ] ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ + ] + ++ lib.optional (lib.versionAtLeast ffversion "63" && lib.versionOlder ffversion "69") + (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1500436#c29 + name = "write_error-parallel_make.diff"; + url = "https://hg.mozilla.org/mozilla-central/raw-diff/562655fe/python/mozbuild/mozbuild/action/node.py"; + sha256 = "11d7rgzinb4mwl7yzhidjkajynmxgmffr4l9isgskfapyax9p88y"; + }) + ++ lib.optionals (stdenv.isAarch64 && lib.versionAtLeast ffversion "66" && lib.versionOlder ffversion "67") [ (fetchpatch { url = "https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/09c7fa0dc1d87922e3b464c0fa084df1227fca79/extra/firefox/arm.patch"; sha256 = "1vbpih23imhv5r3g21m3m541z08n9n9j1nvmqax76bmyhn7mxp32"; |