From e791a35b58b1324be6adbb2d1444a416f6986073 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 12 Sep 2024 07:58:28 +0300 Subject: [PATCH] cc-wrapper: Use `getExe` for `expand-response-params` The binary in `expand-response-params` may have an extension like `.exe` `expand-response-params` is `""` in bootstrapping --- pkgs/build-support/cc-wrapper/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 7717c5015cb7..f4a78254d3de 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -733,7 +733,7 @@ stdenvNoCC.mkDerivation { # for substitution in utils.bash # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence - expandResponseParams = "${expand-response-params}/bin/expand-response-params"; + expandResponseParams = lib.optionalString (expand-response-params != "") (lib.getExe expand-response-params); # TODO(@sternenseemann): rename env var via stdenv rebuild shell = getBin runtimeShell + runtimeShell.shellPath or ""; gnugrep_bin = optionalString (!nativeTools) gnugrep;