diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-09-13 08:27:49 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-09-13 09:52:06 +0200 |
commit | 544c8dbdfb35493bc23d441498187e5d88484541 (patch) | |
tree | 53e75992adb523127e32c9e7ac0656307cdba2f2 /pkgs/applications/networking/browsers | |
parent | 4afc26f0fa9e0e480ac09cecb03dbbd6f97955ca (diff) | |
parent | 264693f9d7e9f2404f4be879caced3574f8aacd9 (diff) |
Merge #97612: firefox-esr-68: drop
Diffstat (limited to 'pkgs/applications/networking/browsers')
3 files changed, 10 insertions, 80 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 1f1831d3c9180..78ee213490888 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,8 +7,8 @@ , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libXdamage, libevent, libstartup_notification -, libvpx, libvpx_1_8 -, icu, icu67, libpng, jemalloc, glib +, libvpx_1_8 +, icu67, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , rust-cbindgen, nodejs, nasm, fetchpatch , debugBuild ? false @@ -112,17 +112,13 @@ stdenv.mkDerivation ({ xorg.libXext unzip makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib - nasm + nasm icu67 libvpx_1_8 # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss ] - ++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ] - ++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8 - ++ lib.optional (lib.versionOlder ffversion "78") icu - ++ lib.optional (lib.versionAtLeast ffversion "78.0") icu67 ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 @@ -132,12 +128,10 @@ stdenv.mkDerivation ({ AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; - NIX_CFLAGS_COMPILE = toString ([ + NIX_CFLAGS_COMPILE = toString [ "-I${glib.dev}/include/gio-unix-2.0" "-I${nss.dev}/include/nss" - ] - ++ lib.optional (pname == "firefox-esr" && lib.versionOlder ffversion "69") - "-Wno-error=format-security"); + ]; postPatch = '' rm -rf obj-x86_64-pc-linux-gnu @@ -228,16 +222,7 @@ stdenv.mkDerivation ({ "--with-system-nspr" "--with-system-nss" ] - ++ lib.optionals (lib.versionOlder ffversion "78") [ - "--with-system-bz2" - "--enable-startup-notification" - "--disable-gconf" - ] - ++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite" ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks" - ++ lib.optionals (lib.versionOlder ffversion "69") [ - "--enable-webrender=build" - ] ++ flag alsaSupport "alsa" ++ flag pulseaudioSupport "pulseaudio" @@ -305,16 +290,13 @@ stdenv.mkDerivation ({ inherit execdir; inherit browserName; } // lib.optionalAttrs gtk3Support { inherit gtk3; }; -} // -lib.optionalAttrs (lib.versionAtLeast ffversion "74") { + hardeningDisable = [ "format" ]; # -Werror=format-security -} // -# the build system verifies checksums of the bundled rust sources -# ./third_party/rust is be patched by our libtool fixup code in stdenv -# unfortunately we can't just set this to `false` when we do not want it. -# See https://github.com/NixOS/nixpkgs/issues/77289 for more details -lib.optionalAttrs (lib.versionAtLeast ffversion "72") { + # the build system verifies checksums of the bundled rust sources + # ./third_party/rust is be patched by our libtool fixup code in stdenv + # unfortunately we can't just set this to `false` when we do not want it. + # See https://github.com/NixOS/nixpkgs/issues/77289 for more details # Ideally we would figure out how to tell the build system to not # care about changed hashes as we are already doing that when we # fetch the sources. Any further modifications of the source tree diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch deleted file mode 100644 index 1380c7dc9a2b1..0000000000000 --- a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx65.patch +++ /dev/null @@ -1,24 +0,0 @@ -Remove about:buildconfig. If used as-is, it would add unnecessary runtime dependencies. -diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp ---- firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:48:28.988747428 +0100 -+++ firefox-65.0/docshell/base/nsAboutRedirector.cpp 2019-01-23 00:51:13.378188397 +0100 -@@ -67,8 +67,6 @@ - {"about", "chrome://global/content/aboutAbout.xhtml", 0}, - {"addons", "chrome://mozapps/content/extensions/extensions.xul", - nsIAboutModule::ALLOW_SCRIPT}, -- {"buildconfig", "chrome://global/content/buildconfig.html", -- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, - {"checkerboard", "chrome://global/content/aboutCheckerboard.xhtml", - nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | - nsIAboutModule::ALLOW_SCRIPT}, -diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn ---- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 -+++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 -@@ -36,7 +36,6 @@ - content/global/plugins.css - content/global/browser-child.js - content/global/browser-content.js --* content/global/buildconfig.html - content/global/buildconfig.css - content/global/contentAreaUtils.js - content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index a438c37ac2bfc..a024fc359d887 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -61,32 +61,4 @@ rec { versionKey = "ffversion"; }; }; - - firefox-esr-68 = (common rec { - pname = "firefox-esr"; - ffversion = "68.12.0esr"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3"; - }; - - patches = [ - ./no-buildconfig-ffx65.patch - ]; - - meta = firefox.meta // { - description = "A web browser built from Firefox Extended Support Release source tree"; - }; - updateScript = callPackage ./update.nix { - attrPath = "firefox-esr-68-unwrapped"; - versionSuffix = "esr"; - versionKey = "ffversion"; - }; - }).override { - # Mozilla unfortunately doesn't support building with latest NSS anymore; - # instead they provide ESR releases for NSS: - # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases - nss = nss_3_44; - }; - } |