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

chromiumDev: Add the missing clang-format binary 

The fix from 1d961a4c6d was unfortunately incomplete. This commit fixes
the second error [0] that occurs later during the build (the Python
script third_party/blink/renderer/bindings/scripts/generate_bindings.py
requires buildtools/linux64/clang-format).

[0]: https://github.com/NixOS/nixpkgs/pull/81016#issuecomment-591572821
This commit is contained in:
Michael Weiss 2020-03-01 10:01:55 +01:00
parent 0193158b32
commit 02ca096a85
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
1 changed files with 5 additions and 1 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 , python2Packages, perl, pkgconfig, clang-tools
, nspr, systemd, kerberos , nspr, systemd, kerberos
, utillinux, alsaLib , utillinux, alsaLib
, bison, gperf , bison, gperf
@ -104,6 +104,8 @@ 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;
@ -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 ${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 ({