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.
NixOS · Apr 24, 2021 · a902d99 · a902d99
1 parent 42a20ab
commit a902d99
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
@@ -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;

diff --git a/...ment/compilers/llvm/12/libc++/default.nix → ...ment/compilers/llvm/12/libcxx/default.nix b/...ment/compilers/llvm/12/libc++/default.nix → ...ment/compilers/llvm/12/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "1wf3ww29xkx7prs7pdwicy5qqfapib26110jgmkjrbka9z57bjvx";

diff --git a/...t/compilers/llvm/12/libc++abi/default.nix → ...t/compilers/llvm/12/libcxxabi/default.nix b/...t/compilers/llvm/12/libc++abi/default.nix → ...t/compilers/llvm/12/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1cbmzspwjlr8f6sp73pw6ivf4dpg6rpc61by0q1m2zca2k6yif3a";

diff --git a/...rs/llvm/12/libc++abi/libcxxabi-wasm.patch → ...rs/llvm/12/libcxxabi/libcxxabi-wasm.patch b/...rs/llvm/12/libc++abi/libcxxabi-wasm.patch → ...rs/llvm/12/libcxxabi/libcxxabi-wasm.patch