From ba5e8f283539ca31643a576d650ffdab366dfacc Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Sat, 14 Jan 2023 14:38:32 -0600 Subject: [PATCH] resholve: track missed upstream Nix fix Forgot to port this resholve Nix API fix in the course of #184292. Same change as: github.com/abathur/resholve/commit/b743d2eb12d82e35c567733a7a884174e3606641 --- pkgs/development/misc/resholve/resholve-utils.nix | 2 ++ pkgs/development/misc/resholve/test.nix | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 26bf492d23a..a3bc159b957 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -129,6 +129,7 @@ rec { ) ) )} + '' + lib.optionalString (partialSolution.interpreter != "none") '' ${partialSolution.interpreter} -n $out ''; }; @@ -146,6 +147,7 @@ rec { ) ) } + '' + lib.optionalString (partialSolution.interpreter != "none") '' ${partialSolution.interpreter} -n $out/bin/${name} ''; }; diff --git a/pkgs/development/misc/resholve/test.nix b/pkgs/development/misc/resholve/test.nix index 2b8a3ec3d29..4d029622e8a 100644 --- a/pkgs/development/misc/resholve/test.nix +++ b/pkgs/development/misc/resholve/test.nix @@ -179,4 +179,11 @@ rec { echo "Hello" file . ''; + resholvedScriptBinNone = resholve.writeScriptBin "resholved-script-bin" { + inputs = [ file ]; + interpreter = "none"; + } '' + echo "Hello" + file . + ''; }