From e19361f8d349cc4d8456bc5d1663e0929ad41421 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 30 Mar 2025 20:43:48 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.libcxx: move pname --- pkgs/development/compilers/llvm/common/libcxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix index a47ba2d46219..929d31c49738 100644 --- a/pkgs/development/compilers/llvm/common/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix @@ -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';