diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2020-03-23 19:46:22 +0100 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2020-03-23 21:50:48 +0100 |
| commit | fca8961bdbb401dd39e4c5f57a3fb96b51d773ab (patch) | |
| tree | 0fee703caccd4120be53d69f3cc786558c667f48 /pkgs/applications/networking | |
| parent | 68a963fc709271d8fd14e42d245247859ba8287b (diff) | |
| download | nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.tar nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.tar.gz nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.tar.bz2 nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.tar.lz nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.tar.xz nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.tar.zst nixlib-fca8961bdbb401dd39e4c5f57a3fb96b51d773ab.zip | |
Revert "chromiumDev: Add the missing clang-format binary"
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
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 9d7f529dad67..a5f79805aba3 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, 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 ({ |