Skip to content

Commit

Permalink
crystal: cope with !(stdenv.cc.libcxx?cxxabi)
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Joseph committed Jan 20, 2024
1 parent 1bb69e8 commit 8670f50
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/crystal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ let
# See https://github.com/NixOS/nixpkgs/pull/195606#issuecomment-1356491277
substituteInPlace spec/compiler/loader/unix_spec.cr \
--replace 'it "parses file paths"' 'pending "parses file paths"'
'' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null)) ''
'' + lib.optionalString (stdenv.cc.isClang && (stdenv.cc.libcxx != null) && stdenv.cc.libcxx?cxxabi.libName) ''
# Darwin links against libc++ not libstdc++. Newer versions of clang (12+) require
# libc++abi to be linked explicitly (see https://github.com/NixOS/nixpkgs/issues/166205).
substituteInPlace src/llvm/lib_llvm.cr \
Expand Down

0 comments on commit 8670f50

Please sign in to comment.