From 4f788a27200cf45a47e8f33422f136bf8b7a4ded Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sat, 29 Mar 2025 23:11:30 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.compiler-rt: move pname --- .../compilers/llvm/common/compiler-rt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix index 6b486d88cb50..6ae15af1d1fe 100644 --- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix @@ -48,8 +48,6 @@ let inherit (stdenv.hostPlatform) isMusl isAarch64 isWindows; noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic || isWindows; - pname = "compiler-rt${lib.optionalString (haveLibc) "-libc"}"; - src' = if monorepoSrc != null then runCommand "compiler-rt-src-${version}" { inherit (monorepoSrc) passthru; } ( @@ -68,7 +66,8 @@ let in stdenv.mkDerivation (finalAttrs: { - inherit pname version; + pname = "compiler-rt${lib.optionalString (haveLibc) "-libc"}"; + inherit version; src = src'; sourceRoot = "${finalAttrs.src.name}/compiler-rt";