Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

1 files changed, 5 insertions, 6 deletions

diff --git a/nixpkgs/pkgs/development/tools/clang-tools/default.nix b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
index e09da0287c76..42bcf7fd055f 100644
--- a/nixpkgs/pkgs/development/tools/clang-tools/default.nix
+++ b/nixpkgs/pkgs/development/tools/clang-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, writeScript, llvmPackages }:
+{ stdenv, writeScript, llvmPackages }:
 
 let
   clang = llvmPackages.clang-unwrapped;
@@ -7,8 +7,9 @@ in
 
 stdenv.mkDerivation {
   name = "clang-tools-${version}";
-  builder = writeScript "builder" ''
-    source $stdenv/setup
+  unpackPhase = ":";
+  installPhase = ''
+    mkdir -p $out/bin
     for tool in \
       clang-apply-replacements \
       clang-check \
@@ -16,11 +17,9 @@ stdenv.mkDerivation {
       clang-rename \
       clang-tidy
     do
-      makeWrapper $clang/bin/$tool $out/bin/$tool --argv0 $tool
+      ln -s ${clang}/bin/$tool $out/bin/$tool
     done
   '';
-  buildInputs = [ makeWrapper ];
-  inherit clang;
   meta = clang.meta // {
     description = "Standalone command line tools for C++ development";
     maintainers = with stdenv.lib.maintainers; [ aherrmann ];