diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2024-05-10 20:07:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 20:07:38 +0000 |
| commit | 5f6f3dce0672fd64c2cb0d7cc9e4bf302cc6eec5 (patch) | |
| tree | 111b37bfcaacf0467696f2c643742d71e2d02595 /pkgs/applications/networking/browsers/chromium | |
| parent | 966fd1be01818529c8cbdbd34fa9a41bc17d574c (diff) | |
| parent | 8df62b078d46adec7da4daf8ab6b4132082283a1 (diff) | |
Merge pull request #308196 from Mic92/element-desktop
element-desktop,electron: fix cross build
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 20e987facdc3c..5770456f177fa 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,6 +20,7 @@ , pkgsBuildHost # configurePhase: , gnChromium +, symlinkJoin # Build inputs: , libpng @@ -360,6 +361,14 @@ let ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . ''; + llvmCcAndBintools = symlinkJoin { + name = "llvmCcAndBintools"; + paths = [ + pkgsBuildTarget.${llvmPackages_attrName}.llvm + pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc + ]; + }; + gnFlags = mkGnFlags ({ # Main build and toolchain settings: # Create an official and optimized release build (only official builds @@ -426,7 +435,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 = "${pkgsBuildTarget.${llvmPackages_attrName}.stdenv.cc}"; + clang_base_path = "${llvmCcAndBintools}"; 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): |