diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-11-07 14:53:42 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-11-07 14:54:38 +0100 |
| commit | eb3fd61bb6fd92e0e5f6f717fa21128e278d4e56 (patch) | |
| tree | 7b17f49dc84fb96a94516904c1aff83ed49d92ee /pkgs/applications/networking/browsers/firefox | |
| parent | 04b374eb9c843aa275c3f7483f322cf599677d7d (diff) | |
firefox-esr: fix build by using older rust
It's probably the same issue as with thunderbird.
Diffstat (limited to 'pkgs/applications/networking/browsers/firefox')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 03cf35e1a6be..a98891df4d13 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 , icu67, libpng, jemalloc, glib -, autoconf213, which, gnused, cargo, rustc +, autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , debugBuild ? false @@ -102,6 +102,10 @@ let buildStdenv = if ltoSupport then overrideCC stdenv llvmPackages.lldClang 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 buildStdenv.mkDerivation ({ |