Merge pull request #304740 from vcunat/p/firefox-23.11

[23.11] buildMozillaMach: fix version mismatch in llvmPackages
NixOS · Apr 17, 2024 · e402c3e · e402c3e
2 parents 1bf7d3e + 9af2d80
commit e402c3e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -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 {