From e274e608ca669bcb78591e979a01104f17cc73ab Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Dec 2025 17:10:57 +0100 Subject: [PATCH] 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}" ''