diff --git a/artiq/windows/default.nix b/artiq/windows/default.nix index 56659ef..e7370c4 100644 --- a/artiq/windows/default.nix +++ b/artiq/windows/default.nix @@ -25,15 +25,15 @@ let sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=$TMPDIR/known_hosts"; ssh = cmd: '' echo "ssh windows \"${cmd}\"" - sshpass -p${sshPassword} -- \ - ssh -np 2022 ${sshOpts} \ + ${sshpass}/bin/sshpass -p${sshPassword} -- \ + ${openssh}/bin/ssh -np 2022 ${sshOpts} \ ${sshUser}@localhost \ "${cmd}" ''; scp = src: target: '' echo "Copy ${src} to ${target}" - sshpass -p${sshPassword} -- \ - scp -P 2022 ${sshOpts} \ + ${sshpass}/bin/sshpass -p${sshPassword} -- \ + ${openssh}/bin/scp -P 2022 ${sshOpts} \ "${src}" "${sshUser}@localhost:${target}" ''; installCondaPkg = pkg: '' diff --git a/artiq/windows/install.nix b/artiq/windows/install.nix index 5904272..9c0459c 100644 --- a/artiq/windows/install.nix +++ b/artiq/windows/install.nix @@ -33,15 +33,15 @@ let sshOpts = "-o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=\\$TMPDIR/known_hosts"; ssh = cmd: '' echo "ssh windows \"${cmd}\"" - sshpass -p${sshPassword} -- \ - ssh -np 2022 ${sshOpts} \ + ${sshpass}/bin/sshpass -p${sshPassword} -- \ + ${openssh}/bin/ssh -np 2022 ${sshOpts} \ ${sshUser}@localhost \ "${cmd}" ''; scp = src: target: '' echo "Copy ${src} to ${target}" - sshpass -p${sshPassword} -- \ - scp -P 2022 ${sshOpts} \ + ${sshpass}/bin/sshpass -p${sshPassword} -- \ + ${openssh}/bin/scp -P 2022 ${sshOpts} \ "${src}" "${sshUser}@localhost:${target}" ''; in