Merge master into staging

1 files changed, 11 insertions, 4 deletions

diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix
index 0fcaee5746817..0abea99f64ae1 100644
--- a/pkgs/development/tools/clang-tools/default.nix
+++ b/pkgs/development/tools/clang-tools/default.nix
@@ -2,24 +2,31 @@
 
 let
   clang = llvmPackages.clang-unwrapped;
+
+in stdenv.mkDerivation {
+  pname = "clang-tools";
   version = stdenv.lib.getVersion clang;
-in
 
-stdenv.mkDerivation {
-  name = "clang-tools-${version}";
   dontUnpack = true;
+
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/bin
     for tool in \
       clang-apply-replacements \
       clang-check \
       clang-format \
       clang-rename \
-      clang-tidy
+      clang-tidy \
+      clangd
     do
       ln -s ${clang}/bin/$tool $out/bin/$tool
     done
+
+    runHook postInstall
   '';
+
   meta = clang.meta // {
     description = "Standalone command line tools for C++ development";
     maintainers = with stdenv.lib.maintainers; [ aherrmann ];