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

firefox-esr: fix build by using older rust 

It's probably the same issue as with thunderbird.
This commit is contained in:
Vladimír Čunát 2020-11-07 14:53:42 +01:00
parent 04b374eb9c
commit eb3fd61bb6
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
, hunspell, libXdamage, libevent, libstartup_notification , hunspell, libXdamage, libevent, libstartup_notification
, libvpx_1_8 , libvpx_1_8
, icu67, libpng, jemalloc, glib , icu67, libpng, jemalloc, glib
, autoconf213, which, gnused, cargo, rustc , autoconf213, which, gnused, rustPackages, rustPackages_1_45
, rust-cbindgen, nodejs, nasm, fetchpatch , rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4 , gnum4
, debugBuild ? false , debugBuild ? false
@ -102,6 +102,10 @@ let
buildStdenv = if ltoSupport buildStdenv = if ltoSupport
then overrideCC stdenv llvmPackages.lldClang then overrideCC stdenv llvmPackages.lldClang
else stdenv; else stdenv;
# 78 ESR won't build with rustc 1.47
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
rustc cargo;
in in
buildStdenv.mkDerivation ({ buildStdenv.mkDerivation ({