public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "chromiumDev: Add the missing clang-format binary"

Browse Source 
This reverts commit 02ca096a85eced0d653004ae95f7cc6d8597b13e.

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:
Michael Weiss 2020-03-23 19:46:22 +01:00
parent 68a963fc70
commit fca8961bdb
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -7,7 +7,7 @@
, xdg_utils, yasm, minizip, libwebp , xdg_utils, yasm, minizip, libwebp
, libusb1, pciutils, nss, re2, zlib , libusb1, pciutils, nss, re2, zlib
, python2Packages, perl, pkgconfig, clang-tools , python2Packages, perl, pkgconfig
, nspr, systemd, kerberos , nspr, systemd, kerberos
, utillinux, alsaLib , utillinux, alsaLib
, bison, gperf , bison, gperf
@ -104,8 +104,6 @@ let
result result
else result; else result;
llvm-clang-tools = clang-tools.override { inherit llvmPackages; };
base = rec { base = rec {
name = "${packageName}-unwrapped-${version}"; name = "${packageName}-unwrapped-${version}";
inherit (upstream-info) channel 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 ${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 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 ({ gnFlags = mkGnFlags ({