From 8df98457b582abafcf08928d4f8867574bef4c5f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 2 Feb 2026 00:15:27 +0100 Subject: [PATCH] tevent: move NIX_LDFLAGS into env for structuredAttrs --- pkgs/by-name/te/tevent/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/te/tevent/package.nix b/pkgs/by-name/te/tevent/package.nix index 20ac0af6795f..0a72e5133d26 100644 --- a/pkgs/by-name/te/tevent/package.nix +++ b/pkgs/by-name/te/tevent/package.nix @@ -61,15 +61,18 @@ stdenv.mkDerivation (finalAttrs: { "--cross-execute=${stdenv.hostPlatform.emulator buildPackages}" ]; - # python-config from build Python gives incorrect values when cross-compiling. - # If python-config is not found, the build falls back to using the sysconfig - # module, which works correctly in all cases. - PYTHON_CONFIG = "/invalid"; - - # https://reviews.llvm.org/D135402 - NIX_LDFLAGS = lib.optional ( - stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17" - ) "--undefined-version"; + env = { + # python-config from build Python gives incorrect values when cross-compiling. + # If python-config is not found, the build falls back to using the sysconfig + # module, which works correctly in all cases. + PYTHON_CONFIG = "/invalid"; + } + // + lib.optionalAttrs (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") + { + # https://reviews.llvm.org/D135402 + NIX_LDFLAGS = "--undefined-version"; + }; meta = { description = "Event system based on the talloc memory management library";