BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #82130 from Ericson2314/fetchsvn-cross

Browse source 
fetchsvn: Fix for cross
This commit is contained in:
John Ericson 2020-03-10 09:53:17 -04:00 committed by GitHub
commit 320334aee7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/build-support/fetchsvn/builder.sh
View file

@ -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

19
pkgs/build-support/fetchsvn/default.nix
View file

@ -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;