From 3ac28c3645c65121c17145f338cac11f43c5fc9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 11 Oct 2014 22:21:57 +0200
Subject: [PATCH] libc++: Fix on Linux

On Linux (unlike Darwin), libc++ cannot automatically propagate
libc++abi. So we need to add libc++abi to the RPATH.
---
 pkgs/development/libraries/libc++/default.nix   | 2 +-
 pkgs/development/libraries/libc++/setup-hook.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
index ae4b9d825e80..99e9bfe1de2e 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  passthru.abi = libcxxabi;
+  inherit libcxxabi;
 
   # Remove a Makefile that causes many retained dependencies.
   postInstall = "rm $out/include/c++/v1/Makefile";
diff --git a/pkgs/development/libraries/libc++/setup-hook.sh b/pkgs/development/libraries/libc++/setup-hook.sh
index e2b1b10e8a3f..8543d09d8f52 100644
--- a/pkgs/development/libraries/libc++/setup-hook.sh
+++ b/pkgs/development/libraries/libc++/setup-hook.sh
@@ -1,2 +1,2 @@
-NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem @out@/include/c++/v1 -stdlib=libc++"
-NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -stdlib=libc++"
+export NIX_CFLAGS_COMPILE+=" -isystem @out@/include/c++/v1 -stdlib=libc++"
+export NIX_CFLAGS_LINK+=" -stdlib=libc++ -Wl,-rpath,@libcxxabi@/lib"