@@ -9,7 +9,7 @@
99, hunspell, libevent, libstartup_notification
1010, libvpx_1_8
1111, icu67, libpng, jemalloc, glib, pciutils
12−, autoconf213, which, gnused, rustPackages, rustPackages_1_45
12+, autoconf213, which, gnused, rustPackages
1313, rust-cbindgen, nodejs, nasm, fetchpatch
1414, gnum4
1515, debugBuild ? false
@@ -90,19 +90,13 @@ let
9090 then "/Applications/${binaryNameCapitalized}.app/Contents/MacOS"
9191 else "/bin";
9292
93− # 78 ESR won't build with rustc 1.47
94− inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45)
95− rustc cargo;
93+ inherit (rustPackages) rustc cargo;
9694
9795 # Darwin's stdenv provides the default llvmPackages version, match that since
9896 # clang LTO on Darwin is broken so the stdenv is not being changed.
99− # Target the LLVM version that rustc -Vv reports it is built with for LTO.
100− # rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11
10197 llvmPackages = if stdenv.isDarwin
10298 then buildPackages.llvmPackages
103− else if lib.versionAtLeast rustc.llvm.version "11"
104− then buildPackages.llvmPackages_11
105− else buildPackages.llvmPackages_10;
99+ else buildPackages.llvmPackages_11;
106100
107101 # When LTO for Darwin is fixed, the following will need updating as lld
108102 # doesn't work on it. For now it is fine since ltoSupport implies no Darwin.