chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

llvmPackages_{12,13,14,15,16,17,18,19,20,git}.libcxx: move pname

Browse Source
This commit is contained in:
Tristan Ross
2025-03-30 20:43:48 -07:00
committed by Alyssa Ross
parent 71a22894ec
commit e19361f8d3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/common/libcxx/default.nix
View File

@@ -26,7 +26,6 @@
# https://github.com/NixOS/nixpkgs/issues/269548
assert cxxabi == null || !stdenv.hostPlatform.isDarwin;
let
pname = "libcxx";
cxxabiName = "lib${if cxxabi == null then "cxxabi" else cxxabi.libName}";
runtimes = [ "libcxx" ] ++ lib.optional (cxxabi == null) "libcxxabi";
@@ -34,7 +33,7 @@ let
useLLVM = stdenv.hostPlatform.useLLVM or false;
src' = if monorepoSrc != null then
runCommand "${pname}-src-${version}" { inherit (monorepoSrc) passthru; } (''
runCommand "libcxx-src-${version}" { inherit (monorepoSrc) passthru; } (''
mkdir -p "$out/llvm"
'' + (lib.optionalString (lib.versionAtLeast release_version "14") ''
cp -r ${monorepoSrc}/cmake "$out"
@@ -118,7 +117,8 @@ let
in
stdenv.mkDerivation (finalAttrs: {
inherit pname version cmakeFlags;
pname = "libcxx";
inherit version cmakeFlags;
src = src';