From 82b0b57580a2ce08b194771e7373187b51485335 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 28 May 2017 20:34:19 +0200
Subject: [PATCH 1/2] clang: fix libclang library id on darwin

---
 pkgs/development/compilers/llvm/4/clang/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 4fa180a2701..bc286eaf05e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+, fixDarwinDylibNames
+}:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -14,7 +16,8 @@ let
     '';
 
     nativeBuildInputs = [ cmake python python.pkgs.sphinx ];
-    buildInputs = [ libedit libxml2 llvm ];
+    buildInputs = [ libedit libxml2 llvm ]
+      ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"

From a6a21d7209a03bbb4ad413297f27c9326f87231c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 25 May 2017 18:54:34 +0200
Subject: [PATCH 2/2] rtags: remove workaround for libclang

---
 pkgs/development/tools/rtags/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix
index 6ab227dedcd..4f396e26bf9 100644
--- a/pkgs/development/tools/rtags/default.nix
+++ b/pkgs/development/tools/rtags/default.nix
@@ -22,12 +22,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
-    for f in $out/bin/{rc,rdm,rp}; do
-      install_name_tool -change @rpath/libclang.dylib ${llvmPackages.clang.cc}/lib/libclang.dylib ''${f}
-    done
-  '';
-
   meta = {
     description = "C/C++ client-server indexer based on clang";
     homepage = https://github.com/andersbakken/rtags;