diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2018-10-23 09:16:43 +0200 |
|---|---|---|
| committer | Andreas Rammhold <andreas@rammhold.de> | 2018-10-23 10:15:46 +0200 |
| commit | 277da59e47134dd51c2a5e0c6c426748f67e81d8 (patch) | |
| tree | 603a5f29887b830a141ab52f10e7957e9282a83b /pkgs/applications/networking | |
| parent | 8a9b6bc6076b3cc7a17d99ce0799ba2b4014c08a (diff) | |
| download | nixlib-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')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 4 |
2 files changed, 6 insertions, 3 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 = '' diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index bd42cf2d9d0b..826956eb5640 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -26,10 +26,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "62.0.3"; + ffversion = "63.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0kvb664s47bmmdq2ppjsnyqy8yaiig1xj81r25s36c3i8igfq3zxvws10k2dlmmmrwyc5k4g9i9imgkxj7r3xwwqxc72dl429wvfys8"; + sha512 = "095nn50g72l4ihbv26qqqs2jg4ahnmd54vxvm7nxwrnkx901aji7pph6c91zfpf7df26ib1b0pqyir9vsac40sdxc8yrzm6d0lyl1m2"; }; patches = nixpkgsPatches ++ [ |