diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 207f069f86a..3fae28be2be 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU_combined, sqlite, unzip, makeWrapper -, hunspell, libevent, libstartup_notification, libvpx +, hunspell, libXdamage, libevent, libstartup_notification, libvpx , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , rust-cbindgen, nodejs, nasm, fetchpatch @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { icu libpng jemalloc glib ] ++ lib.optionals (!isTorBrowserLike) [ nspr nss ] + ++ lib.optional (lib.versionOlder ffversion "53") libXdamage ++ lib.optional (lib.versionOlder ffversion "61") hunspell # >= 66 requires nasm for the AV1 lib dav1d diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 35a21ec62ca..945bbfba566 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: +{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3, overrideCC, gccStdenv, gcc6 }: let @@ -47,7 +47,7 @@ rec { # the web, there are many old useful plugins targeting offline # activities (e.g. ebook readers, syncronous translation, etc) that # will probably never be ported to WebExtensions API. - firefox-esr-52 = common rec { + firefox-esr-52 = (common rec { pname = "firefox-esr"; ffversion = "52.9.0esr"; src = fetchurl { @@ -65,6 +65,9 @@ rec { description = "A web browser built from Firefox Extended Support Release source tree"; knownVulnerabilities = [ "Support ended in August 2018." ]; }; + }).override { + stdenv = overrideCC gccStdenv gcc6; # gcc7 fails with "undefined reference to `__divmoddi4'" + gtk3Support = false; }; firefox-esr-60 = common rec {