llvmPackages_12: Always use the attribute name for pname

This might be a bit debatable but upstream uses "xx" instead of "++"
when using it as identifier / in the code (file/directory names, build
scripts, website URLs, etc.) so we should probably too.
And at least the attribute name and pname will be consistent now.
This commit is contained in:
Michael Weiss 2021-04-24 11:31:11 +02:00
parent 42a20abd27
commit a902d99422
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
4 changed files with 4 additions and 4 deletions

View file

@ -192,12 +192,12 @@ let
libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
libcxx = callPackage ./libc++ ({ inherit llvm_meta; } //
libcxx = callPackage ./libcxx ({ inherit llvm_meta; } //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
}));
libcxxabi = callPackage ./libc++abi ({ inherit llvm_meta; } //
libcxxabi = callPackage ./libcxxabi ({ inherit llvm_meta; } //
(lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
libunwind = libraries.libunwind;

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++";
pname = "libcxx";
inherit version;
src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";

View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation {
pname = "libc++abi";
pname = "libcxxabi";
inherit version;
src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";