From c06d7d83dde944c8f945331a2932daa2e9bd1a55 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Sun, 30 Mar 2025 21:15:55 -0700 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17,18,19,20,git}.lld: move post patch --- .../compilers/llvm/common/lld/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix index b64fe97088fb..f62ec76e35f6 100644 --- a/pkgs/development/compilers/llvm/common/lld/default.nix +++ b/pkgs/development/compilers/llvm/common/lld/default.nix @@ -15,13 +15,7 @@ , getVersionFile , fetchpatch }: -stdenv.mkDerivation (finalAttrs: -let - postPatch = lib.optionalString (lib.versionOlder release_version "14") '' - substituteInPlace MachO/CMakeLists.txt --replace-fail \ - '(''${LLVM_MAIN_SRC_DIR}/' '(../' - ''; -in { +stdenv.mkDerivation (finalAttrs: { pname = "lld"; inherit version; @@ -69,6 +63,11 @@ in { "-DLLVM_TABLEGEN_EXE=${buildLlvmTools.tblgen}/bin/llvm-tblgen" ] ++ devExtraCmakeFlags; + postPatch = lib.optionalString (lib.versionOlder release_version "14") '' + substituteInPlace MachO/CMakeLists.txt --replace-fail \ + '(''${LLVM_MAIN_SRC_DIR}/' '(../' + ''; + # Musl's default stack size is too small for lld to be able to link Firefox. LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152"; @@ -86,4 +85,4 @@ in { of several different linkers. ''; }; -} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; })) +})