diff options
| author | Stig Palmquist <stig@stig.io> | 2020-08-27 12:17:59 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-09-29 11:53:19 +0000 |
| commit | 41ed335c59f86edfb0abb8637e580f6601ac8f2f (patch) | |
| tree | f9dcad28a71c1dac3abc7a126d514af4c8e74b90 /nixpkgs | |
| parent | 1d39a4abb544b0208a4952d96c0d71a7b33a1e3d (diff) | |
| download | nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.tar nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.tar.gz nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.tar.bz2 nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.tar.lz nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.tar.xz nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.tar.zst nixlib-41ed335c59f86edfb0abb8637e580f6601ac8f2f.zip | |
firefox: 79.0 -> 80.0
(cherry picked from commit c408178cabe18922957c4196532edb44a782dedd)
Diffstat (limited to 'nixpkgs')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix | 8 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 41231f28f18d..ddb6c2ca04fd 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -142,6 +142,14 @@ stdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + substituteInPlace dom/system/IOUtils.h \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' + + substituteInPlace dom/system/IOUtils.cpp \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' \ + --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \ + --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"' ''; nativeBuildInputs = diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index cbf575a58d0e..99c9e192a828 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "79.0"; + ffversion = "80.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r"; + sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc"; }; patches = [ |