From e0d3c9d0317edf7fd8d99e78066a7cdaf1c5da21 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 May 2021 19:43:21 +0000
Subject: [PATCH] llvmPackages*.libcxx*: Always use the attribute name for
 pname

This decision was made in a902d99422c6a522ffae7b8ad7711e23c7490d42 but
just for LLVM 12. Now we apply it consitently.
---
 pkgs/development/compilers/llvm/10/default.nix                | 4 ++--
 .../compilers/llvm/10/{libc++ => libcxx}/default.nix          | 2 +-
 .../llvm/10/{libc++ => libcxx}/gnu-install-dirs.patch         | 0
 .../compilers/llvm/10/{libc++abi => libcxxabi}/default.nix    | 2 +-
 .../llvm/10/{libc++abi => libcxxabi}/gnu-install-dirs.patch   | 0
 .../llvm/10/{libc++abi => libcxxabi}/no-threads.patch         | 0
 .../compilers/llvm/10/{libc++abi => libcxxabi}/wasm.patch     | 0
 pkgs/development/compilers/llvm/11/default.nix                | 4 ++--
 .../compilers/llvm/11/{libc++ => libcxx}/default.nix          | 2 +-
 .../llvm/11/{libc++ => libcxx}/gnu-install-dirs.patch         | 0
 .../compilers/llvm/11/{libc++abi => libcxxabi}/default.nix    | 2 +-
 .../llvm/11/{libc++abi => libcxxabi}/gnu-install-dirs.patch   | 0
 .../llvm/11/{libc++abi => libcxxabi}/no-threads.patch         | 0
 .../compilers/llvm/11/{libc++abi => libcxxabi}/wasm.patch     | 0
 pkgs/development/compilers/llvm/5/default.nix                 | 4 ++--
 .../compilers/llvm/5/{libc++ => libcxx}/default.nix           | 2 +-
 .../llvm/5/{libc++ => libcxx}/gnu-install-dirs.patch          | 0
 .../compilers/llvm/5/{libc++abi => libcxxabi}/default.nix     | 2 +-
 .../llvm/5/{libc++abi => libcxxabi}/gnu-install-dirs.patch    | 0
 pkgs/development/compilers/llvm/6/default.nix                 | 4 ++--
 .../compilers/llvm/6/{libc++ => libcxx}/default.nix           | 2 +-
 .../llvm/6/{libc++ => libcxx}/gnu-install-dirs.patch          | 0
 .../compilers/llvm/6/{libc++abi => libcxxabi}/default.nix     | 2 +-
 .../llvm/6/{libc++abi => libcxxabi}/gnu-install-dirs.patch    | 0
 pkgs/development/compilers/llvm/7/default.nix                 | 4 ++--
 .../compilers/llvm/7/{libc++ => libcxx}/default.nix           | 2 +-
 .../llvm/7/{libc++ => libcxx}/gnu-install-dirs.patch          | 0
 .../compilers/llvm/7/{libc++abi => libcxxabi}/default.nix     | 2 +-
 .../llvm/7/{libc++abi => libcxxabi}/gnu-install-dirs.patch    | 0
 pkgs/development/compilers/llvm/8/default.nix                 | 4 ++--
 .../compilers/llvm/8/{libc++ => libcxx}/default.nix           | 2 +-
 .../llvm/8/{libc++ => libcxx}/gnu-install-dirs.patch          | 0
 .../compilers/llvm/8/{libc++abi => libcxxabi}/default.nix     | 2 +-
 .../llvm/8/{libc++abi => libcxxabi}/gnu-install-dirs.patch    | 0
 .../llvm/8/{libc++abi => libcxxabi}/no-threads.patch          | 0
 .../compilers/llvm/8/{libc++abi => libcxxabi}/wasm.patch      | 0
 pkgs/development/compilers/llvm/9/default.nix                 | 4 ++--
 .../compilers/llvm/9/{libc++ => libcxx}/default.nix           | 2 +-
 .../llvm/9/{libc++ => libcxx}/gnu-install-dirs.patch          | 0
 .../compilers/llvm/9/{libc++abi => libcxxabi}/default.nix     | 2 +-
 .../llvm/9/{libc++abi => libcxxabi}/gnu-install-dirs.patch    | 0
 .../llvm/9/{libc++abi => libcxxabi}/no-threads.patch          | 0
 .../compilers/llvm/9/{libc++abi => libcxxabi}/wasm.patch      | 0
 43 files changed, 28 insertions(+), 28 deletions(-)
 rename pkgs/development/compilers/llvm/10/{libc++ => libcxx}/default.nix (98%)
 rename pkgs/development/compilers/llvm/10/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/10/{libc++abi => libcxxabi}/default.nix (99%)
 rename pkgs/development/compilers/llvm/10/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/10/{libc++abi => libcxxabi}/no-threads.patch (100%)
 rename pkgs/development/compilers/llvm/10/{libc++abi => libcxxabi}/wasm.patch (100%)
 rename pkgs/development/compilers/llvm/11/{libc++ => libcxx}/default.nix (98%)
 rename pkgs/development/compilers/llvm/11/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/11/{libc++abi => libcxxabi}/default.nix (99%)
 rename pkgs/development/compilers/llvm/11/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/11/{libc++abi => libcxxabi}/no-threads.patch (100%)
 rename pkgs/development/compilers/llvm/11/{libc++abi => libcxxabi}/wasm.patch (100%)
 rename pkgs/development/compilers/llvm/5/{libc++ => libcxx}/default.nix (98%)
 rename pkgs/development/compilers/llvm/5/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/5/{libc++abi => libcxxabi}/default.nix (98%)
 rename pkgs/development/compilers/llvm/5/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/6/{libc++ => libcxx}/default.nix (98%)
 rename pkgs/development/compilers/llvm/6/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/6/{libc++abi => libcxxabi}/default.nix (98%)
 rename pkgs/development/compilers/llvm/6/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/7/{libc++ => libcxx}/default.nix (98%)
 rename pkgs/development/compilers/llvm/7/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/7/{libc++abi => libcxxabi}/default.nix (99%)
 rename pkgs/development/compilers/llvm/7/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/8/{libc++ => libcxx}/default.nix (99%)
 rename pkgs/development/compilers/llvm/8/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/8/{libc++abi => libcxxabi}/default.nix (99%)
 rename pkgs/development/compilers/llvm/8/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/8/{libc++abi => libcxxabi}/no-threads.patch (100%)
 rename pkgs/development/compilers/llvm/8/{libc++abi => libcxxabi}/wasm.patch (100%)
 rename pkgs/development/compilers/llvm/9/{libc++ => libcxx}/default.nix (98%)
 rename pkgs/development/compilers/llvm/9/{libc++ => libcxx}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/9/{libc++abi => libcxxabi}/default.nix (99%)
 rename pkgs/development/compilers/llvm/9/{libc++abi => libcxxabi}/gnu-install-dirs.patch (100%)
 rename pkgs/development/compilers/llvm/9/{libc++abi => libcxxabi}/no-threads.patch (100%)
 rename pkgs/development/compilers/llvm/9/{libc++abi => libcxxabi}/wasm.patch (100%)

diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix
index b63caf151f3d..754c8cdc7789 100644
--- a/pkgs/development/compilers/llvm/10/default.nix
+++ b/pkgs/development/compilers/llvm/10/default.nix
@@ -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;
diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/10/libc++/default.nix
rename to pkgs/development/compilers/llvm/10/libcxx/default.nix
index 1e5dc5b2dacc..10616642f740 100644
--- a/pkgs/development/compilers/llvm/10/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/10/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0v78bfr6h2zifvdqnj2wlfk4pvxzrqn3hg1v6lqk3y12bx9p9xny";
diff --git a/pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/10/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/10/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/10/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/10/libc++abi/default.nix b/pkgs/development/compilers/llvm/10/libcxxabi/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/10/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/10/libcxxabi/default.nix
index bc5e77b739d7..aa34af37c624 100644
--- a/pkgs/development/compilers/llvm/10/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/10/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "0yqs722y76cwvmfsq0lb917r9m3fci7bf5z3yzl71yz9n88ghzm9";
diff --git a/pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/10/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/10/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/10/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/10/libc++abi/no-threads.patch b/pkgs/development/compilers/llvm/10/libcxxabi/no-threads.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/10/libc++abi/no-threads.patch
rename to pkgs/development/compilers/llvm/10/libcxxabi/no-threads.patch
diff --git a/pkgs/development/compilers/llvm/10/libc++abi/wasm.patch b/pkgs/development/compilers/llvm/10/libcxxabi/wasm.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/10/libc++abi/wasm.patch
rename to pkgs/development/compilers/llvm/10/libcxxabi/wasm.patch
diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix
index d119460736c3..a8f6523dd905 100644
--- a/pkgs/development/compilers/llvm/11/default.nix
+++ b/pkgs/development/compilers/llvm/11/default.nix
@@ -178,12 +178,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;
diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/11/libc++/default.nix
rename to pkgs/development/compilers/llvm/11/libcxx/default.nix
index e095350cea77..08150dc2f22b 100644
--- a/pkgs/development/compilers/llvm/11/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/11/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "1rgqsqpgi0vkga5d7hy0iyfsqgzfz7q1xy7afdfa1snp1qjks8xv";
diff --git a/pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/11/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/11/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/11/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/11/libc++abi/default.nix b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/11/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/11/libcxxabi/default.nix
index a79a0d2f07ad..209d34ba92a8 100644
--- a/pkgs/development/compilers/llvm/11/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/11/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1azcf31mxw59hb1x17xncnm3dyw90ylh8rqx462lvypqh3nr6c8l";
diff --git a/pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/11/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/11/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/11/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/11/libc++abi/no-threads.patch b/pkgs/development/compilers/llvm/11/libcxxabi/no-threads.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/11/libc++abi/no-threads.patch
rename to pkgs/development/compilers/llvm/11/libcxxabi/no-threads.patch
diff --git a/pkgs/development/compilers/llvm/11/libc++abi/wasm.patch b/pkgs/development/compilers/llvm/11/libcxxabi/wasm.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/11/libc++abi/wasm.patch
rename to pkgs/development/compilers/llvm/11/libcxxabi/wasm.patch
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index c416964b22a3..67743cb8c97c 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -91,9 +91,9 @@ let
 
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
-    libcxx = callPackage ./libc++ {};
+    libcxx = callPackage ./libcxx {};
 
-    libcxxabi = callPackage ./libc++abi {};
+    libcxxabi = callPackage ./libcxxabi {};
 
     openmp = callPackage ./openmp.nix {};
   });
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/5/libc++/default.nix
rename to pkgs/development/compilers/llvm/5/libcxx/default.nix
index 77421b4e6d8d..f7e973be3d4c 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libcxx/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";
diff --git a/pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/5/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/5/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/5/libc++abi/default.nix b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/5/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/5/libcxxabi/default.nix
index 8bc3b9e2977b..85323c4371cb 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/5/libcxxabi/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
diff --git a/pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/5/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/5/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index b78f7a62506d..b4fd0a3bf719 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -92,9 +92,9 @@ let
 
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
-    libcxx = callPackage ./libc++ {};
+    libcxx = callPackage ./libcxx {};
 
-    libcxxabi = callPackage ./libc++abi {};
+    libcxxabi = callPackage ./libcxxabi {};
 
     openmp = callPackage ./openmp.nix {};
   });
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/6/libc++/default.nix
rename to pkgs/development/compilers/llvm/6/libcxx/default.nix
index 69314fbe2ba1..001fa3ed6837 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libcxx/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0rzw4qvxp6qx4l4h9amrq02gp7hbg8lw4m0sy3k60f50234gnm3n";
diff --git a/pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/6/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/6/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/6/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/6/libc++abi/default.nix b/pkgs/development/compilers/llvm/6/libcxxabi/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/6/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/6/libcxxabi/default.nix
index 04054f0ba0e7..109b5ef51bcc 100644
--- a/pkgs/development/compilers/llvm/6/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/6/libcxxabi/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, cmake, fetch, libcxx, libunwind, llvm, version }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "0prqvdj317qrc8nddaq1hh2ag9algkd9wbkj3y4mr5588k12x7r0";
diff --git a/pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/6/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/6/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/6/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix
index 937bdb644a7c..fbae9840b24c 100644
--- a/pkgs/development/compilers/llvm/7/default.nix
+++ b/pkgs/development/compilers/llvm/7/default.nix
@@ -180,12 +180,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;
diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/7/libc++/default.nix
rename to pkgs/development/compilers/llvm/7/libcxx/default.nix
index afc59d911794..954ac50658b3 100644
--- a/pkgs/development/compilers/llvm/7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/7/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
diff --git a/pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/7/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/7/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/7/libc++abi/default.nix b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/7/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/7/libcxxabi/default.nix
index 31ead6eb4215..bb9fb684bc0a 100644
--- a/pkgs/development/compilers/llvm/7/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/7/libcxxabi/default.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
diff --git a/pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/7/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/7/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix
index 2ff579d071d5..ccf80f3df2a8 100644
--- a/pkgs/development/compilers/llvm/8/default.nix
+++ b/pkgs/development/compilers/llvm/8/default.nix
@@ -180,12 +180,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;
diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libcxx/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/8/libc++/default.nix
rename to pkgs/development/compilers/llvm/8/libcxx/default.nix
index d73600b441d1..5589cb7180a2 100644
--- a/pkgs/development/compilers/llvm/8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/8/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0y4vc9z36c1zlq15cnibdzxnc1xi5glbc6klnm8a41q3db4541kz";
diff --git a/pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/8/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/8/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/8/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/8/libc++abi/default.nix b/pkgs/development/compilers/llvm/8/libcxxabi/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/8/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/8/libcxxabi/default.nix
index 5659bb4f14ac..ccc43d7cb21a 100644
--- a/pkgs/development/compilers/llvm/8/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/8/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1vznz8n1z1h8af0ga451m98lc2hjnv4fyzl71napsvjhvk4g6nxp";
diff --git a/pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/8/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/8/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/8/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/8/libc++abi/no-threads.patch b/pkgs/development/compilers/llvm/8/libcxxabi/no-threads.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/8/libc++abi/no-threads.patch
rename to pkgs/development/compilers/llvm/8/libcxxabi/no-threads.patch
diff --git a/pkgs/development/compilers/llvm/8/libc++abi/wasm.patch b/pkgs/development/compilers/llvm/8/libcxxabi/wasm.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/8/libc++abi/wasm.patch
rename to pkgs/development/compilers/llvm/8/libcxxabi/wasm.patch
diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix
index 8a1400dfd375..ff9a24626306 100644
--- a/pkgs/development/compilers/llvm/9/default.nix
+++ b/pkgs/development/compilers/llvm/9/default.nix
@@ -180,12 +180,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;
diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libcxx/default.nix
similarity index 98%
rename from pkgs/development/compilers/llvm/9/libc++/default.nix
rename to pkgs/development/compilers/llvm/9/libcxx/default.nix
index 3cdb4f32a050..bfcd18a6e436 100644
--- a/pkgs/development/compilers/llvm/9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/9/libcxx/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++";
+  pname = "libcxx";
   inherit version;
 
   src = fetch "libcxx" "0d2bj5i6mk4caq7skd5nsdmz8c2m5w5anximl5wz3x32p08zz089";
diff --git a/pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/9/libcxx/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/9/libc++/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/9/libcxx/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/9/libc++abi/default.nix b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/9/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/9/libcxxabi/default.nix
index 5358985f448e..1f0d7af25e4f 100644
--- a/pkgs/development/compilers/llvm/9/libc++abi/default.nix
+++ b/pkgs/development/compilers/llvm/9/libcxxabi/default.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  pname = "libc++abi";
+  pname = "libcxxabi";
   inherit version;
 
   src = fetch "libcxxabi" "1b4aiaa8cirx52vk2p5kfk57qmbqf1ipb4nqnjhdgqps9jm7iyg8";
diff --git a/pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch b/pkgs/development/compilers/llvm/9/libcxxabi/gnu-install-dirs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/9/libc++abi/gnu-install-dirs.patch
rename to pkgs/development/compilers/llvm/9/libcxxabi/gnu-install-dirs.patch
diff --git a/pkgs/development/compilers/llvm/9/libc++abi/no-threads.patch b/pkgs/development/compilers/llvm/9/libcxxabi/no-threads.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/9/libc++abi/no-threads.patch
rename to pkgs/development/compilers/llvm/9/libcxxabi/no-threads.patch
diff --git a/pkgs/development/compilers/llvm/9/libc++abi/wasm.patch b/pkgs/development/compilers/llvm/9/libcxxabi/wasm.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/9/libc++abi/wasm.patch
rename to pkgs/development/compilers/llvm/9/libcxxabi/wasm.patch