public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

llvmPackages_9: hashes, pname-ification

Browse Source
This commit is contained in:
Will Dietz
2019-09-19 13:24:37 -05:00
parent 9552213d07
commit 99eeff0f69
11 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/llvm/9/libc++/default.nix
+1 -5
View File
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
pname = "libc++";
inherit version;
src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
src = fetch "libcxx" "136j3v7il9aq8wyp48klx6sifnl5asj4lf5c8yx08cjx5fbn4h9w";
postUnpack = ''
unpackFile ${libcxxabi.src}
@@ -14,10 +14,6 @@ stdenv.mkDerivation {
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch;
prePatch = ''
substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++"
'';
preConfigure = ''
# Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package
cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR")