From 0fd0be3e123ecfb2647fbbd932c7c24a3bb836aa Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 22 Apr 2023 18:30:40 -0700 Subject: [PATCH] chromium: (cross): use cc-wrapper-clang instead of bare clang Prior to this commit chromium was writing the bare, unwrapped `clang` path into `gnFlags`. When called without the wrapper, clang doesn't know that the linker for cross compilation isn't called `lld` anymore -- it is called `${targetPrefix}-lld`. This commit fixes that problem by referencing the cc-wrapper-ified clang which is part of `llvmPackages.stdenv`. (cherry picked from commit 10706a026b481344a17e45d44ef01f8e65076744) --- pkgs/applications/networking/browsers/chromium/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 1fcd488de8d0..36e25939962a 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -304,7 +304,7 @@ let rtc_use_pipewire = true; # Disable PGO because the profile data requires a newer compiler version (LLVM 14 isn't sufficient): chrome_pgo_phase = 0; - clang_base_path = "${llvmPackages.clang}"; + clang_base_path = "${llvmPackages.stdenv.cc}"; use_qt = false; # To fix the build as we don't provide libffi_pic.a # (ld.lld: error: unable to find library -l:libffi_pic.a):