diff options
| author | Will Dietz <w@wdtz.org> | 2018-09-19 08:36:40 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-09-23 13:30:18 -0500 |
| commit | e3030a2908ca212dd9e6307695effb8bbcaf23af (patch) | |
| tree | 406eb7811daa8c30fcfd29672e79fc7895a598a3 /pkgs/development/compilers | |
| parent | 167e799d81de43b51bf05d8b8e0a7ddac8e06202 (diff) | |
| download | nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.tar nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.tar.gz nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.tar.bz2 nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.tar.lz nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.tar.xz nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.tar.zst nixlib-e3030a2908ca212dd9e6307695effb8bbcaf23af.zip | |
libc++7: prefer 'optional' as suggested by comment
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/llvm/7/libc++/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index 992794f38e54..76bfb34975e6 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -10,11 +10,7 @@ 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 [ - ../../libcxx-0001-musl-hacks.patch - ] else null; + 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++" |