From 32abdaea3ef594dc9afa3c36b5e5e13a384912f1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Dec 2025 14:54:56 +0100
Subject: [PATCH 1/3] imake: fix for structuredAttrs

tradcpp must be in env for substitution in setupHook
---
 pkgs/by-name/im/imake/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/im/imake/package.nix b/pkgs/by-name/im/imake/package.nix
index 1c9aaf45ee93..ded538891614 100644
--- a/pkgs/by-name/im/imake/package.nix
+++ b/pkgs/by-name/im/imake/package.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${
       if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc"
     }\"'";
+    inherit tradcpp;
   };
 
   preInstall = ''
@@ -71,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${xorg-cf-files}/lib/X11/config/* $out/lib/X11/config
   '';
 
-  inherit tradcpp xorg-cf-files;
+  inherit xorg-cf-files;
   setupHook = ./setup-hook.sh;
 
   passthru = {

From cb3c79a53f6a0de464f753ae21f9e8389bd91f10 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Dec 2025 16:05:26 +0100
Subject: [PATCH 2/3] imake: remove redundant inherit

---
 pkgs/by-name/im/imake/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/im/imake/package.nix b/pkgs/by-name/im/imake/package.nix
index ded538891614..bc69d73b09f7 100644
--- a/pkgs/by-name/im/imake/package.nix
+++ b/pkgs/by-name/im/imake/package.nix
@@ -72,7 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${xorg-cf-files}/lib/X11/config/* $out/lib/X11/config
   '';
 
-  inherit xorg-cf-files;
   setupHook = ./setup-hook.sh;
 
   passthru = {

From e274e608ca669bcb78591e979a01104f17cc73ab Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Dec 2025 17:10:57 +0100
Subject: [PATCH 3/3] imake: use replaceVars

---
 pkgs/by-name/im/imake/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/im/imake/package.nix b/pkgs/by-name/im/imake/package.nix
index bc69d73b09f7..94f2860963ad 100644
--- a/pkgs/by-name/im/imake/package.nix
+++ b/pkgs/by-name/im/imake/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
+  replaceVars,
   tradcpp,
   xorg-cf-files,
   pkg-config,
@@ -60,19 +61,18 @@ stdenv.mkDerivation (finalAttrs: {
     "ac_cv_path_RAWCPP=${stdenv.cc.targetPrefix}cpp"
   ];
 
-  env = {
-    CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${
-      if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc"
-    }\"'";
-    inherit tradcpp;
-  };
+  env.CFLAGS = "-DIMAKE_COMPILETIME_CPP='\"${
+    if stdenv.hostPlatform.isDarwin then "${tradcpp}/bin/cpp" else "gcc"
+  }\"'";
 
   preInstall = ''
     mkdir -p $out/lib/X11/config
     ln -s ${xorg-cf-files}/lib/X11/config/* $out/lib/X11/config
   '';
 
-  setupHook = ./setup-hook.sh;
+  setupHook = replaceVars ./setup-hook.sh {
+    inherit tradcpp;
+  };
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''