From d7b24b856e0b11feb92dd633d155ca98731f6601 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 10:30:09 +0100 Subject: [PATCH 1/2] stdenv: fix prefixKey for structuredAttrs --- pkgs/stdenv/generic/setup.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index f051ae6c7d44..5c047faafcf6 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1455,7 +1455,16 @@ configurePhase() { fi if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then - prependToVar configureFlags "${prefixKey:---prefix=}$prefix" + # For __structuredAttrs: if prefixKey ends in a space, + # we need to add the prefixKey and the prefix as separate entries, + # and since we prepend, we do it in reverse order. + local -r prefixKeyOrDefault="${prefixKey:---prefix=}" + if [ "${prefixKeyOrDefault: -1}" = " " ]; then + prependToVar configureFlags "$prefix" + prependToVar configureFlags "${prefixKeyOrDefault::-1}" + else + prependToVar configureFlags "$prefixKeyOrDefault$prefix" + fi fi if [[ -f "$configureScript" ]]; then From 022b6ae355c2ba3af6917c548c731451dbca5424 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 13 Dec 2025 10:30:25 +0100 Subject: [PATCH 2/2] eresi: enable structuredAttrs --- pkgs/by-name/er/eresi/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/er/eresi/package.nix b/pkgs/by-name/er/eresi/package.nix index 817cd76ef664..0e2783ad658b 100644 --- a/pkgs/by-name/er/eresi/package.nix +++ b/pkgs/by-name/er/eresi/package.nix @@ -84,6 +84,8 @@ stdenv.mkDerivation rec { installTargets = lib.singleton "install" ++ lib.optional stdenv.hostPlatform.is64bit "install64"; + __structuredAttrs = true; + meta = { description = "ERESI Reverse Engineering Software Interface"; license = lib.licenses.gpl2Only;