Revert "chromiumDev: Add the missing clang-format binary"
This reverts commit 02ca096a85
.
The clang-format binary is now included in the release tarball [0] and
we don't need to add it anymore. This fixes the following build error:
ln: failed to create symbolic link 'buildtools/linux64/clang-format': File exists
However, the build still fails a bit later in the configure phase.
[0]: https://bugs.chromium.org/p/chromium/issues/detail?id=1052503
This commit is contained in:
parent
68a963fc70
commit
fca8961bdb
|
@ -7,7 +7,7 @@
|
|||
, xdg_utils, yasm, minizip, libwebp
|
||||
, libusb1, pciutils, nss, re2, zlib
|
||||
|
||||
, python2Packages, perl, pkgconfig, clang-tools
|
||||
, python2Packages, perl, pkgconfig
|
||||
, nspr, systemd, kerberos
|
||||
, utillinux, alsaLib
|
||||
, bison, gperf
|
||||
|
@ -104,8 +104,6 @@ let
|
|||
result
|
||||
else result;
|
||||
|
||||
llvm-clang-tools = clang-tools.override { inherit llvmPackages; };
|
||||
|
||||
base = rec {
|
||||
name = "${packageName}-unwrapped-${version}";
|
||||
inherit (upstream-info) channel version;
|
||||
|
@ -218,8 +216,6 @@ 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 ({
|
||||
|
|
Loading…
Reference in New Issue