diff options
author | John Ericson <git@JohnEricson.me> | 2020-03-10 09:53:17 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 09:53:17 -0400 |
commit | 320334aee7f64b85c7ef4a6c508f51dd182151fa (patch) | |
tree | 9fc316a19babca16c43f0b4230daf3cc628d5b69 | |
parent | 2e402c85db0012bb040915ca248419efa4978c7d (diff) | |
parent | 2607aae93fc9db7b05541d8338a7e6bb9871d057 (diff) | |
download | nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.tar nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.tar.gz nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.tar.bz2 nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.tar.lz nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.tar.xz nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.tar.zst nixlib-320334aee7f64b85c7ef4a6c508f51dd182151fa.zip |
Merge pull request #82130 from Ericson2314/fetchsvn-cross
fetchsvn: Fix for cross
-rw-r--r-- | pkgs/build-support/fetchsvn/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/build-support/fetchsvn/default.nix | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index c386a3f3489f..ed3e65f07695 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/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/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 68433d1471d6..06f0ea0a3d1f 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/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; |