git.iko.soy/typeable/nixpkgs
on master help sign in
firefox: 62.0.3 -> 63.0
commit277da59e47134dd51c2a5e0c6c426748f67e81d8 authorAndreas Rammhold <andreas@rammhold.de> dateTue 23 Oct 2018, 09:16 (8 years ago) parent8a9b6bc
2 files changed+6−3
pkgs/applications/networking/browsers/firefox/common.nix+4−1 pkgs/applications/networking/browsers/firefox/packages.nix+2−2
pkgs/applications/networking/browsers/firefox/common.nix+4−1
@@ -10,6 +10,7 @@
1010, hunspell, libevent, libstartup_notification, libvpx
1111, icu, libpng, jemalloc, glib
1212, autoconf213, which, gnused, cargo, rustc, llvmPackages
13+, rust-cbindgen, nodejs
1314, debugBuild ? false
1415
1516### optionals
@@ -111,7 +112,6 @@ stdenv.mkDerivation rec {
111112 "-I${glib.dev}/include/gio-unix-2.0"
112113 ]
113114 ++ lib.optionals (!isTorBrowserLike) [
114− "-I${nspr.dev}/include/nspr"
115115 "-I${nss.dev}/include/nss"
116116 ]
117117 ++ lib.optional stdenv.isDarwin [
@@ -121,12 +121,15 @@ stdenv.mkDerivation rec {
121121
122122 postPatch = lib.optionalString stdenv.isDarwin ''
123123 substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
124+ '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
125+ substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
124126 '';
125127
126128 nativeBuildInputs =
127129 [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ]
128130 ++ lib.optional gtk3Support wrapGAppsHook
129131 ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ]
132+ ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ]
130133 ++ extraNativeBuildInputs;
131134
132135 preConfigure = ''
pkgs/applications/networking/browsers/firefox/packages.nix+2−2
@@ -26,10 +26,10 @@ rec {
2626
2727 firefox = common rec {
2828 pname = "firefox";
29− ffversion = "62.0.3";
29+ ffversion = "63.0";
3030 src = fetchurl {
3131 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
32− sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8";
32+ sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2";
3333 };
3434
3535 patches = nixpkgsPatches ++ [