macopix: move NIX_LDFLAGS into env for structuredAttrs

2026-02-07 14:15:58 +01:00
parent d92a66198f
commit 6d61f4b9fa
1 changed files with 7 additions and 6 deletions
@@ -32,12 +32,13 @@ stdenv.mkDerivation (finalAttrs: {

  enableParallelBuilding = true;

-  # Workaround build failure on -fno-common toolchains:
-  #   ld: dnd.o:src/main.h:136: multiple definition of
-  #     `MENU_EXT'; main.o:src/main.h:136: first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  NIX_LDFLAGS = "-lX11";
+  env = {
+    # Workaround build failure on -fno-common toolchains:
+    #   ld: dnd.o:src/main.h:136: multiple definition of
+    #     `MENU_EXT'; main.o:src/main.h:136: first defined here
+    NIX_CFLAGS_COMPILE = "-fcommon";
+    NIX_LDFLAGS = "-lX11";
+  };

  nativeInstallCheckInputs = [
    versionCheckHook