diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2021-04-24 11:31:11 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2021-04-24 11:43:29 +0200 |
commit | a902d99422c6a522ffae7b8ad7711e23c7490d42 (patch) | |
tree | 3f1781509a5769b30a0f926790bd13f5c7f35d7d /pkgs/development | |
parent | 42a20abd270a1347ace03f9145dc909a4d0c55e4 (diff) |
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.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/llvm/12/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/libcxx/default.nix (renamed from pkgs/development/compilers/llvm/12/libc++/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/libcxxabi/default.nix (renamed from pkgs/development/compilers/llvm/12/libc++abi/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch (renamed from pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 00922ed96e2ca..5b25f37bc2c03 100644 --- 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/pkgs/development/compilers/llvm/12/libc++/default.nix b/pkgs/development/compilers/llvm/12/libcxx/default.nix index d85d890879ecc..7b3b26b959e46 100644 --- a/pkgs/development/compilers/llvm/12/libc++/default.nix +++ b/pkgs/development/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/pkgs/development/compilers/llvm/12/libc++abi/default.nix b/pkgs/development/compilers/llvm/12/libcxxabi/default.nix index 22ec211a3b05b..dab6c583e889a 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi/default.nix +++ b/pkgs/development/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/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch index 4ebfe46aa813d..4ebfe46aa813d 100644 --- a/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch +++ b/pkgs/development/compilers/llvm/12/libcxxabi/libcxxabi-wasm.patch |