llvmPackages*.libcxx*: Always use the attribute name for pname

This decision was made in a902d99422 but just for LLVM 12. Now we apply it consitently.
2021-05-12 00:14:56 +00:00
parent 894f0c6ec8
commit e0d3c9d031
43 changed files with 28 additions and 28 deletions
@@ -177,12 +177,12 @@ let

    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;

-    libcxx = callPackage ./libc++ ({} //
+    libcxx = callPackage ./libcxx ({} //
      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
      }));

-    libcxxabi = callPackage ./libc++abi ({} //
+    libcxxabi = callPackage ./libcxxabi ({} //
      (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
        stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
        libunwind = libraries.libunwind;