JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #58630 from volth/patch-312

Browse Source 
firefox-esr-52: fix build
This commit is contained in:
Andreas Rammhold 2019-04-09 13:08:58 +00:00 committed by GitHub
commit 4b00df4305
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -8,7 +8,7 @@
, libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify , freetype, fontconfig, file, nspr, nss, libnotify
, yasm, libGLU_combined, sqlite, unzip, makeWrapper , yasm, libGLU_combined, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx , hunspell, libXdamage, libevent, libstartup_notification, libvpx
, icu, libpng, jemalloc, glib , icu, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc, llvmPackages , autoconf213, which, gnused, cargo, rustc, llvmPackages
, rust-cbindgen, nodejs, nasm, fetchpatch , rust-cbindgen, nodejs, nasm, fetchpatch
@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
icu libpng jemalloc glib icu libpng jemalloc glib
] ]
++ lib.optionals (!isTorBrowserLike) [ nspr nss ] ++ lib.optionals (!isTorBrowserLike) [ nspr nss ]
++ lib.optional (lib.versionOlder ffversion "53") libXdamage
++ lib.optional (lib.versionOlder ffversion "61") hunspell ++ lib.optional (lib.versionOlder ffversion "61") hunspell
# >= 66 requires nasm for the AV1 lib dav1d # >= 66 requires nasm for the AV1 lib dav1d

7
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -1,4 +1,4 @@
{ lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3 }: { lib, callPackage, stdenv, fetchurl, fetchFromGitHub, fetchpatch, python3, overrideCC, gccStdenv, gcc6 }:
let let
@ -47,7 +47,7 @@ rec {
# the web, there are many old useful plugins targeting offline # the web, there are many old useful plugins targeting offline
# activities (e.g. ebook readers, syncronous translation, etc) that # activities (e.g. ebook readers, syncronous translation, etc) that
# will probably never be ported to WebExtensions API. # will probably never be ported to WebExtensions API.
firefox-esr-52 = common rec { firefox-esr-52 = (common rec {
pname = "firefox-esr"; pname = "firefox-esr";
ffversion = "52.9.0esr"; ffversion = "52.9.0esr";
src = fetchurl { src = fetchurl {
@ -65,6 +65,9 @@ rec {
description = "A web browser built from Firefox Extended Support Release source tree"; description = "A web browser built from Firefox Extended Support Release source tree";
knownVulnerabilities = [ "Support ended in August 2018." ]; 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 { firefox-esr-60 = common rec {