From 3deb18034cac6f952d08667fbf2cf7f5b8c02291 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 30 Mar 2025 21:15:22 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.lld: move src --- .../compilers/llvm/common/lld/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index df7fb6912d41..b64fe97088fb 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -17,7 +17,15 @@ }: stdenv.mkDerivation (finalAttrs: let - src' = + postPatch = lib.optionalString (lib.versionOlder release_version "14") '' + substituteInPlace MachO/CMakeLists.txt --replace-fail \ + '(''${LLVM_MAIN_SRC_DIR}/' '(../' + ''; +in { + pname = "lld"; + inherit version; + + src = if monorepoSrc != null then runCommand "lld-src-${version}" { inherit (monorepoSrc) passthru; } ('' mkdir -p "$out" @@ -30,16 +38,6 @@ let mkdir -p "$out/llvm" '') else src; - postPatch = lib.optionalString (lib.versionOlder release_version "14") '' - substituteInPlace MachO/CMakeLists.txt --replace-fail \ - '(''${LLVM_MAIN_SRC_DIR}/' '(../' - ''; -in { - pname = "lld"; - inherit version; - - src = src'; - sourceRoot = "${finalAttrs.src.name}/lld"; patches =