Skip to content

Commit

Permalink
buildMozillaMach: fix version mismatch in llvmPackages
Browse files Browse the repository at this point in the history
llvmPackagesBuildBuild0 had a wrong version (with FF >= 125)
That also caused lots of warnings and consequently exceeding log limits:
https://hydra.nixos.org/build/256471785
  • Loading branch information
vcunat committed Apr 17, 2024
1 parent 1bf7d3e commit 9af2d80
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,20 @@
# > the experience of Firefox users, you won't have any issues using the
# > official branding.
, enableOfficialBranding ? true
}:
}@args:

assert stdenv.cc.libc or null != null;
assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}: pipewireSupport requires both wayland and webrtc support.";

let
inherit (lib) enableFeature;

inherit (if lib.versionAtLeast version "125" then rustPackages_1_76 else rustPackages_1_73)
cargo rustc rustPlatform;
rustAttr = if lib.versionAtLeast version "125" then "rustPackages_1_76" else "rustPackages_1_73";
inherit (args.${rustAttr}) cargo rustc rustPlatform;

# Target the LLVM version that rustc is built with for LTO.
llvmPackages0 = rustc.llvmPackages;
llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages;
llvmPackagesBuildBuild0 = pkgsBuildBuild.${rustAttr}.rustc.llvmPackages;

# Force the use of lld and other llvm tools for LTO
llvmPackages = llvmPackages0.override {
Expand Down

0 comments on commit 9af2d80

Please sign in to comment.