diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/build-support/fetchsvn | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/build-support/fetchsvn')
-rw-r--r-- | nixpkgs/pkgs/build-support/fetchsvn/builder.sh | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/build-support/fetchsvn/default.nix | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/build-support/fetchsvn/builder.sh b/nixpkgs/pkgs/build-support/fetchsvn/builder.sh index c386a3f3489f..ed3e65f07695 100644 --- a/nixpkgs/pkgs/build-support/fetchsvn/builder.sh +++ b/nixpkgs/pkgs/build-support/fetchsvn/builder.sh @@ -2,10 +2,6 @@ source $stdenv/setup header "exporting $url (r$rev) into $out" -if test "$sshSupport"; then - export SVN_SSH="$openssh/bin/ssh" -fi - if test -n "$http_proxy"; then # Configure proxy mkdir .subversion diff --git a/nixpkgs/pkgs/build-support/fetchsvn/default.nix b/nixpkgs/pkgs/build-support/fetchsvn/default.nix index 68433d1471d6..06f0ea0a3d1f 100644 --- a/nixpkgs/pkgs/build-support/fetchsvn/default.nix +++ b/nixpkgs/pkgs/build-support/fetchsvn/default.nix @@ -1,7 +1,13 @@ -{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: -{url, rev ? "HEAD", md5 ? "", sha256 ? "" +{ stdenvNoCC, buildPackages +, subversion, glibcLocales, sshSupport ? true, openssh ? null +}: + +{ url, rev ? "HEAD", md5 ? "", sha256 ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null -, preferLocalBuild ? true }: +, preferLocalBuild ? true +}: + +assert sshSupport -> openssh != null; let repoName = with stdenvNoCC.lib; @@ -32,13 +38,16 @@ else stdenvNoCC.mkDerivation { name = name_; builder = ./builder.sh; - nativeBuildInputs = [ subversion glibcLocales ]; + nativeBuildInputs = [ subversion glibcLocales ] + ++ stdenvNoCC.lib.optional sshSupport openssh; + + SVN_SSH = if sshSupport then "${buildPackages.openssh}/bin/ssh" else null; outputHashAlgo = "sha256"; outputHashMode = "recursive"; outputHash = sha256; - inherit url rev sshSupport openssh ignoreExternals ignoreKeywords; + inherit url rev ignoreExternals ignoreKeywords; impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; |