From 9f63884d844c7593fdcd5e82ddcc87f03dfc4241 Mon Sep 17 00:00:00 2001 From: Moinak Bhattacharyya Date: Thu, 25 Sep 2025 12:44:33 -0500 Subject: [PATCH] clang-tools: add python tools like clang-format-diff to clang-tools --- .../compilers/llvm/common/clang-tools/default.nix | 6 ++++++ pkgs/development/compilers/llvm/common/clang/default.nix | 1 + 2 files changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/clang-tools/default.nix b/pkgs/development/compilers/llvm/common/clang-tools/default.nix index cae95a4a33ea..6ffb2e3490ba 100644 --- a/pkgs/development/compilers/llvm/common/clang-tools/default.nix +++ b/pkgs/development/compilers/llvm/common/clang-tools/default.nix @@ -23,6 +23,12 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/bin + for script in ${clang-unwrapped.python}/share/clang/* ${clang-unwrapped.python}/bin/*; do + if [[ -x "$script" ]]; then + ln -s $script $out/bin/$(basename "$script" .py) + fi + done + for toolPath in ${clang-unwrapped}/bin/clangd ${clang-unwrapped}/bin/clang-*; do toolName=$(basename "$toolPath") diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix index aca810bce2bc..e3ef79039539 100644 --- a/pkgs/development/compilers/llvm/common/clang/default.nix +++ b/pkgs/development/compilers/llvm/common/clang/default.nix @@ -166,6 +166,7 @@ stdenv.mkDerivation ( '' + '' patchShebangs $python/bin + patchShebangs $python/share/clang/ mkdir -p $dev/bin cp bin/clang-tblgen $dev/bin