summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 31e699161968..255b399ef3da 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -7,7 +7,7 @@
, xdg_utils, yasm, minizip, libwebp
, libusb1, pciutils, nss, re2, zlib
-, python2Packages, perl, pkgconfig
+, python2Packages, perl, pkgconfig, clang-tools
, nspr, systemd, kerberos
, utillinux, alsaLib
, bison, gperf
@@ -104,6 +104,8 @@ let
result
else result;
+ llvm-clang-tools = clang-tools.override { inherit llvmPackages; };
+
base = rec {
name = "${packageName}-unwrapped-${version}";
inherit (upstream-info) channel version;
@@ -214,6 +216,8 @@ let
ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang
ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++
ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar
+ '' + optionalString (stdenv.lib.versionAtLeast version "82") ''
+ ln -s ${llvm-clang-tools}/bin/clang-format buildtools/linux64/clang-format
'';
gnFlags = mkGnFlags ({