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