diff options
author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-15 18:17:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-15 18:17:08 +0000 |
commit | d00a5dad2ac689913da6d3aa7c8df3b120e5cf9b (patch) | |
tree | 55a8e90dc939077d97deb3b11c2675f57443b8ff /pkgs/development/misc | |
parent | a6975fd05e752945e8ccc43f7673848f6f02a205 (diff) | |
parent | ba5e8f283539ca31643a576d650ffdab366dfacc (diff) |
Merge pull request #210761 from abathur/resholve_track_missed_fix
resholve: track missed upstream Nix fix
Diffstat (limited to 'pkgs/development/misc')
-rw-r--r-- | pkgs/development/misc/resholve/resholve-utils.nix | 2 | ||||
-rw-r--r-- | pkgs/development/misc/resholve/test.nix | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index d308f483458ff..a903b674eb339 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 2b8a3ec3d296a..4d029622e8ace 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 . + ''; } |