From 099b2748245262bf9ddf3ad702e9f27d93d4fc71 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Wed, 24 Dec 2025 21:09:29 +0100
Subject: [PATCH] llvm: move LDFLAGS into env for structuredAttrs

---
 pkgs/development/compilers/llvm/common/lld/default.nix  | 4 +++-
 pkgs/development/compilers/llvm/common/llvm/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix
index b9c9152ec98d..1940724ff1d7 100644
--- a/pkgs/development/compilers/llvm/common/lld/default.nix
+++ b/pkgs/development/compilers/llvm/common/lld/default.nix
@@ -64,7 +64,9 @@ stdenv.mkDerivation (finalAttrs: {
   ++ devExtraCmakeFlags;
 
   # 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";
+  env = lib.optionalAttrs stdenv.hostPlatform.isMusl {
+    LDFLAGS = "-Wl,-z,stack-size=2097152";
+  };
 
   outputs = [
     "out"
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index 00171a97068e..2ad683977328 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -453,9 +453,9 @@ stdenv.mkDerivation (
       '';
 
     # E.g. Mesa uses the build-id as a cache key (see #93946):
-    LDFLAGS = optionalString (
-      enableSharedLibraries && !stdenv.hostPlatform.isDarwin
-    ) "-Wl,--build-id=sha1";
+    env = lib.optionalAttrs (enableSharedLibraries && !stdenv.hostPlatform.isDarwin) {
+      LDFLAGS = "-Wl,--build-id=sha1";
+    };
 
     cmakeBuildType = "Release";