diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-09-04 17:34:46 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-09-23 17:30:32 +0000 |
| commit | ed10043f75ab92b1be561b46f2c6f10fc84a7b9b (patch) | |
| tree | 2872c8f1f4795f3e88d63a594c9e49e121aee743 /pkgs/development/compilers | |
| parent | d2674c5e154881261ab17d6b0b2c2e77bb4be8ab (diff) | |
| download | nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.tar nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.tar.gz nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.tar.bz2 nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.tar.lz nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.tar.xz nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.tar.zst nixlib-ed10043f75ab92b1be561b46f2c6f10fc84a7b9b.zip | |
llvmPackages_6.libcxx: cleanup with a mass rebuild
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/6/libc++/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 1f87cb83ab01..3a165e9da7b1 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -10,11 +10,9 @@ stdenv.mkDerivation rec { export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" ''; - # on next rebuild, this can be replaced with optionals; for now set to null to avoid - # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ - patches = if stdenv.hostPlatform.isMusl then [ + patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ ../../libcxx-0001-musl-hacks.patch - ] else null; + ]; prePatch = '' substituteInPlace lib/CMakeLists.txt --replace "/usr/lib/libc++" "\''${LIBCXX_LIBCXXABI_LIB_PATH}/libc++" |