diff options
Diffstat (limited to 'perl/lib/Nix/CopyClosure.pm')
| -rw-r--r-- | perl/lib/Nix/CopyClosure.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl/lib/Nix/CopyClosure.pm b/perl/lib/Nix/CopyClosure.pm index 061a15c071cf..e12fef6bb731 100644 --- a/perl/lib/Nix/CopyClosure.pm +++ b/perl/lib/Nix/CopyClosure.pm @@ -100,7 +100,7 @@ sub oldCopyTo { # Optionally use substitutes on the remote host. if (!$dryRun && $useSubstitutes) { - system "ssh $sshHost @{$sshOpts} nix-store -r --ignore-unknown @closure"; + system "ssh $sshHost @{$sshOpts} @globalSshOpts nix-store -r --ignore-unknown @closure"; # Ignore exit status because this is just an optimisation. } @@ -112,7 +112,7 @@ sub oldCopyTo { my $missingSize = 0; while (scalar(@closure) > 0) { my @ps = splice(@closure, 0, 1500); - open(READ, "set -f; ssh $sshHost @{$sshOpts} nix-store --check-validity --print-invalid @ps|"); + open(READ, "set -f; ssh $sshHost @{$sshOpts} @globalSshOpts nix-store --check-validity --print-invalid @ps|"); while (<READ>) { chomp; push @missing, $_; @@ -130,7 +130,7 @@ sub oldCopyTo { if (scalar @missing > 0) { print STDERR "copying ", scalar @missing, " missing paths to ‘$sshHost’...\n"; unless ($dryRun) { - open SSH, "| $progressViewer $compressor ssh $sshHost @{$sshOpts} '$decompressor nix-store --import' > /dev/null" or die; + open SSH, "| $progressViewer $compressor ssh $sshHost @{$sshOpts} @globalSshOpts '$decompressor nix-store --import' > /dev/null" or die; exportPaths(fileno(SSH), $sign, @missing); close SSH or die "copying store paths to remote machine `$sshHost' failed: $?"; } |