diff options
author | taku0 <mxxouy6x3m_github@tatapa.org> | 2019-07-14 14:54:14 +0900 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2019-07-14 22:46:03 +0200 |
commit | 0c436f8ca153f06e05e3e2780322a064e6e2697d (patch) | |
tree | 2125ec7b50e4a057e956c0c1958f901b671fb57e /pkgs/applications/networking/browsers/firefox | |
parent | 48b2dfeca9e548cc8b5c3798483abfe578cfd98b (diff) | |
download | nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.tar nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.tar.gz nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.tar.bz2 nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.tar.lz nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.tar.xz nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.tar.zst nixlib-0c436f8ca153f06e05e3e2780322a064e6e2697d.zip |
firefox: 67.0.4 -> 68.0
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 29b12c9fec09..f464972a9df2 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -4,7 +4,7 @@ , isIceCatLike ? false, icversion ? null , isTorBrowserLike ? false, tbversion ? null }: -{ lib, stdenv, pkgconfig, pango, perl, python2, zip, libIDL +{ lib, stdenv, pkgconfig, pango, perl, python2, python3, zip, libIDL , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper @@ -164,12 +164,15 @@ stdenv.mkDerivation rec { postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) '' substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' + '' + lib.optionalString (lib.versionAtLeast ffversion "68") '' + rm -rf obj-x86_64-pc-linux-gnu ''; nativeBuildInputs = [ autoconf213 which gnused pkgconfig perl python2 cargo rustc ] ++ lib.optional gtk3Support wrapGAppsHook ++ lib.optionals stdenv.isDarwin [ xcbuild rsync ] + ++ lib.optional (lib.versionAtLeast ffversion "61.0") [ python3 ] ++ lib.optionals (lib.versionAtLeast ffversion "63.0") [ rust-cbindgen nodejs ] ++ lib.optionals (lib.versionAtLeast ffversion "67.0") [ llvmPackages.llvm ] # llvm-objdump is required in version >=67.0 ++ extraNativeBuildInputs; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 93449288075b..90cd526897aa 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, fetchFromGitHub, python3, overrideCC, gccStdenv, gcc6 }: +{ lib, callPackage, fetchurl, fetchFromGitHub, overrideCC, gccStdenv, gcc6 }: let @@ -17,18 +17,16 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "67.0.4"; + ffversion = "68.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3krwkc90m320a74vjyzlrxs4jc63cykbmpgisac9kv8m9n0bis5i1yf0dl9n14d9p4p541wvzhqygx7byj6mnvkhbk5b2l0nlvwias2"; + sha512 = "0pg8ww2ldlvdlri0zrzv20x69x00gxshr4afq62pnz7rgrnppkdd0pw5snflisgvpxq1syxcrg5750wz1k4bfjwnyq47jk9h3fzddpw"; }; patches = [ ./no-buildconfig-ffx65.patch ]; - extraNativeBuildInputs = [ python3 ]; - meta = { description = "A web browser built from Firefox source tree"; homepage = http://www.mozilla.com/en-US/firefox/; |