about summary refs log tree commit diff
path: root/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
diff options
context:
space:
mode:
authorStig Palmquist <stig@stig.io>2020-08-27 12:17:59 +0200
committerAlyssa Ross <hi@alyssa.is>2020-09-29 11:53:19 +0000
commit41ed335c59f86edfb0abb8637e580f6601ac8f2f (patch)
treef9dcad28a71c1dac3abc7a126d514af4c8e74b90 /nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix
parent1d39a4abb544b0208a4952d96c0d71a7b33a1e3d (diff)
downloadnixlib-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/pkgs/applications/networking/browsers/firefox/common.nix')
-rw-r--r--nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix8
1 files changed, 8 insertions, 0 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 =