diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index ae4b9d825e8..99e9bfe1de2 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 e2b1b10e8a3..8543d09d8f5 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"