From 35510681537f8663fe5a4bfd45c84bd63131bca0 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 31 Mar 2019 18:55:39 +0000 Subject: [PATCH 1/3] firefox-esr-52: fix build --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 8b7f15ca7eb..1683b3c5121 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -40,7 +40,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 { @@ -58,6 +58,8 @@ rec { description = "A web browser built from Firefox Extended Support Release source tree"; knownVulnerabilities = [ "Support ended in August 2018." ]; }; + }).override { + gtk3Support = false; }; firefox-esr-60 = common rec { From edbb386dc6d542e6dc7baf3cfcdea540535119f6 Mon Sep 17 00:00:00 2001 From: volth Date: Sun, 31 Mar 2019 20:55:05 +0000 Subject: [PATCH 2/3] firefox-esr-52: needs libXdamage headers --- pkgs/applications/networking/browsers/firefox/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 15de1a763d9..9dc04eba1df 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 @@ -120,6 +120,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 From 1c290ea724ffc699fa9aeb1ec5d290d99878a3e3 Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 1 Apr 2019 06:36:02 +0000 Subject: [PATCH 3/3] firefox-esr-52: use gcc6 --- pkgs/applications/networking/browsers/firefox/packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 1683b3c5121..dc56608763d 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 @@ -59,6 +59,7 @@ rec { knownVulnerabilities = [ "Support ended in August 2018." ]; }; }).override { + stdenv = overrideCC gccStdenv gcc6; # gcc7 fails with "undefined reference to `__divmoddi4'" gtk3Support = false; };