diff options
author | John Ericson <git@JohnEricson.me> | 2020-03-18 17:15:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-18 17:15:41 -0400 |
commit | 7562a06e8590cb9257b9caaa577ca7ade1872f36 (patch) | |
tree | 785649683e216e2f1f844425a458c4bd824d2059 /pkgs | |
parent | 16dd1df08174e007d664c808712a639db5eff49e (diff) | |
parent | 2607aae93fc9db7b05541d8338a7e6bb9871d057 (diff) |
Merge pull request #82248 from Ericson2314/fetchsvn-cross
fetchsvn: Fix for cross
Diffstat (limited to 'pkgs')
-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 c386a3f3489f6..ed3e65f076959 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 68433d1471d66..06f0ea0a3d1f6 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; |