about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/firefox/common.nix
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2018-10-23 09:16:43 +0200
committerAndreas Rammhold <andreas@rammhold.de>2018-10-23 10:15:46 +0200
commit277da59e47134dd51c2a5e0c6c426748f67e81d8 (patch)
tree603a5f29887b830a141ab52f10e7957e9282a83b /pkgs/applications/networking/browsers/firefox/common.nix
parent8a9b6bc6076b3cc7a17d99ce0799ba2b4014c08a (diff)
downloadnixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.tar
nixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.tar.gz
nixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.tar.bz2
nixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.tar.lz
nixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.tar.xz
nixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.tar.zst
nixlib-277da59e47134dd51c2a5e0c6c426748f67e81d8.zip
firefox: 62.0.3 -> 63.0
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox/common.nix')
-rw-r--r--pkgs/applications/networking/browsers/firefox/common.nix5
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 b72e3703ef7e..16c9b548325e 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -10,6 +10,7 @@
 , hunspell, libevent, libstartup_notification, libvpx
 , icu, libpng, jemalloc, glib
 , autoconf213, which, gnused, cargo, rustc, llvmPackages
+, rust-cbindgen, nodejs
 , debugBuild ? false
 
 ### optionals
@@ -111,7 +112,6 @@ stdenv.mkDerivation rec {
     "-I${glib.dev}/include/gio-unix-2.0"
   ]
   ++ lib.optionals (!isTorBrowserLike) [
-    "-I${nspr.dev}/include/nspr"
     "-I${nss.dev}/include/nss"
   ]
   ++ lib.optional stdenv.isDarwin [
@@ -121,12 +121,15 @@ stdenv.mkDerivation rec {
 
   postPatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
+  '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
+    substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
   '';
 
   nativeBuildInputs =
     [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
     ++ lib.optional gtk3Support wrapGAppsHook
     ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
+    ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
     ++ extraNativeBuildInputs;
 
   preConfigure = ''