diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/fetchsvn/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/build-support/fetchsvn/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 8153cbdf6d96..d06efa88e291 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -2,6 +2,10 @@ source $stdenv/setup header "exporting $url (r$rev) into $out" +if test "$sshSupport"; then + export SVN_SSH="$openssh/bin/ssh" +fi + # Pipe the "p" character into Subversion to force it to accept the # server's certificate. This is perfectly safe: we don't care # whether the server is being spoofed --- only the cryptographic diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index dd8f7b41f781..ff842b0ee243 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{stdenv, subversion, nix}: {url, rev ? "HEAD", md5}: +{stdenv, subversion, nix, sshSupport ? false, openssh ? null}: {url, rev ? "HEAD", md5}: stdenv.mkDerivation { name = "svn-export"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = md5; - inherit url rev; + inherit url rev sshSupport openssh; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48213a0162bc..8ba9cabba4f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -73,7 +73,8 @@ rec { }; fetchsvn = (import ../build-support/fetchsvn) { - inherit stdenv subversion nix; + inherit stdenv subversion nix openssh; + sshSupport = true; }; fetchcvs = (import ../build-support/fetchcvs) { |