From 6d61f4b9fa971702b17818298ec708ee05bb6419 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 1 Feb 2026 22:55:52 +0100 Subject: [PATCH] macopix: move NIX_LDFLAGS into env for structuredAttrs --- pkgs/by-name/ma/macopix/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ma/macopix/package.nix b/pkgs/by-name/ma/macopix/package.nix index c25d32f1c0c8..c58355fd2299 100644 --- a/pkgs/by-name/ma/macopix/package.nix +++ b/pkgs/by-name/ma/macopix/package.nix @@ -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