diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:38:38 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-30 16:38:38 +0100 |
| commit | 6d059becd396ca8722904081cff7225bc64d5a44 (patch) | |
| tree | e723580f3aa9aeec12d407dbea2c4a0fa1808c95 /pkgs/applications/networking/browsers | |
| parent | bfa5af85b733defd158965fe91d60fd3f7a8a666 (diff) | |
| parent | 59ab29fe88b06b31de5bea7ac11492a9dbc0c680 (diff) | |
| download | nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.gz nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.bz2 nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.lz nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.xz nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.tar.zst nixpkgs-6d059becd396ca8722904081cff7225bc64d5a44.zip | |
Merge gcc-9 into staging (#68029)
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index c6dcd20d62f..d9dc0a4f788 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -161,7 +161,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!isTorBrowserLike) [ "-I${nss.dev}/include/nss" - ]; + ] + ++ lib.optional (pname == "firefox-esr" && lib.versionAtLeast ffversion "68" + && lib.versionOlder ffversion "69") + "-Wno-error=format-security"; postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' |