diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-25 00:02:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 00:02:20 +0000 |
| commit | c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e (patch) | |
| tree | 5f3173b32dd8391102c6ceee2cf224393771ac02 /pkgs/stdenv/darwin | |
| parent | de7e4a82e44535246fc53a21cf383808b2611784 (diff) | |
| parent | 000178d44d0cf57116452b16a5a4a8aec8515bdf (diff) | |
| download | nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.tar nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.tar.gz nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.tar.bz2 nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.tar.lz nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.tar.xz nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.tar.zst nixpkgs-c47e4b69a33fe4c3e26c923bf2cc08d65dcd1d3e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/stdenv/darwin')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 113aa946276..2ee8c070ae1 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -339,6 +339,7 @@ rec { ''; passthru = { isLLVM = true; + cxxabi = self."${finalLlvmPackages}".libcxxabi; }; }; @@ -348,6 +349,9 @@ rec { mkdir -p $out/lib ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib ''; + passthru = { + libName = "c++abi"; + }; }; compiler-rt = stdenv.mkDerivation { |