forked from mirrors/nixpkgs
fetchsvn: Fix for cross
Just use `nativeBuildInputs` at build time.
This commit is contained in:
parent
c1a16501c4
commit
2607aae93f
|
@ -2,10 +2,6 @@ source $stdenv/setup
|
||||||
|
|
||||||
header "exporting $url (r$rev) into $out"
|
header "exporting $url (r$rev) into $out"
|
||||||
|
|
||||||
if test "$sshSupport"; then
|
|
||||||
export SVN_SSH="$openssh/bin/ssh"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -n "$http_proxy"; then
|
if test -n "$http_proxy"; then
|
||||||
# Configure proxy
|
# Configure proxy
|
||||||
mkdir .subversion
|
mkdir .subversion
|
||||||
|
|
|
@ -1,7 +1,13 @@
|
||||||
{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}:
|
{ stdenvNoCC, buildPackages
|
||||||
|
, subversion, glibcLocales, sshSupport ? true, openssh ? null
|
||||||
|
}:
|
||||||
|
|
||||||
{ url, rev ? "HEAD", md5 ? "", sha256 ? ""
|
{ url, rev ? "HEAD", md5 ? "", sha256 ? ""
|
||||||
, ignoreExternals ? false, ignoreKeywords ? false, name ? null
|
, ignoreExternals ? false, ignoreKeywords ? false, name ? null
|
||||||
, preferLocalBuild ? true }:
|
, preferLocalBuild ? true
|
||||||
|
}:
|
||||||
|
|
||||||
|
assert sshSupport -> openssh != null;
|
||||||
|
|
||||||
let
|
let
|
||||||
repoName = with stdenvNoCC.lib;
|
repoName = with stdenvNoCC.lib;
|
||||||
|
@ -32,13 +38,16 @@ else
|
||||||
stdenvNoCC.mkDerivation {
|
stdenvNoCC.mkDerivation {
|
||||||
name = name_;
|
name = name_;
|
||||||
builder = ./builder.sh;
|
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";
|
outputHashAlgo = "sha256";
|
||||||
outputHashMode = "recursive";
|
outputHashMode = "recursive";
|
||||||
outputHash = sha256;
|
outputHash = sha256;
|
||||||
|
|
||||||
inherit url rev sshSupport openssh ignoreExternals ignoreKeywords;
|
inherit url rev ignoreExternals ignoreKeywords;
|
||||||
|
|
||||||
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
impureEnvVars = stdenvNoCC.lib.fetchers.proxyImpureEnvVars;
|
||||||
inherit preferLocalBuild;
|
inherit preferLocalBuild;
|
||||||
|
|
Loading…
Reference in a new issue