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

Revert "firefox-esr: use latest Rust"

Browse Source 
This reverts commit 903e23ad36.

It caused segfaults when playing media:
https://github.com/NixOS/nixpkgs/issues/121408
This commit is contained in:
Milan Pässler 2021-05-01 18:47:29 +02:00
parent 4b2c9640e7
commit d05202ea7c
No known key found for this signature in database
GPG Key ID: A6DC6A7CB0B97859
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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