Apply suggestions from code review

Co-authored-by: Randy Eckenrode <randy@largeandhighquality.com>
NixOS · Aug 3, 2023 · fc85058 · fc85058
1 parent f453d76
commit fc85058
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/pkgs/development/compilers/llvm/16/libcxx/default.nix b/pkgs/development/compilers/llvm/16/libcxx/default.nix
@@ -60,9 +60,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ninja python3 ]
     ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
-  buildInputs = (
-    lib.optional (!headersOnly) cxxabi ++
-    lib.optional ((stdenv.hostPlatform.useLLVM or false) && !stdenv.isDarwin) libunwind
+  buildInputs = lib.optionals (!headersOnly) [ cxxabi ]
+    ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [ libunwind ]
   );
 
   cmakeFlags = let

diff --git a/pkgs/development/compilers/llvm/16/libcxxabi/default.nix b/pkgs/development/compilers/llvm/16/libcxxabi/default.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation rec {
     "-DCMAKE_CXX_COMPILER_WORKS=ON"
   ] ++ lib.optionals (stdenv.hostPlatform.useLLVM or false) [
     "-DLLVM_ENABLE_LIBCXX=ON"
-  ] ++ lib.optionals (!stdenv.isDarwin) [
     "-DLIBCXXABI_USE_LLVM_UNWINDER=ON"
   ] ++ lib.optionals stdenv.hostPlatform.isWasm [
     "-DLIBCXXABI_ENABLE_THREADS=OFF"