JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #26372 from risicle/fetchsvn-unicode

Browse Source 
fetchsvn: set LC_ALL in builder to allow svn to handle unicode filenames
This commit is contained in:
Jörg Thalheim 2017-06-10 12:00:03 +01:00 committed by GitHub
commit 557cc2cb63
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,10 @@ if test -n "$http_proxy"; then
export HOME="$PWD"
fi;
if test -z "$LC_ALL"; then
export LC_ALL="en_US.UTF-8"
fi;
# Pipe the "p" character into Subversion to force it to accept the
# server's certificate. This is perfectly safe: we don't care
# whether the server is being spoofed --- only the cryptographic

4
pkgs/build-support/fetchsvn/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, subversion, sshSupport ? false, openssh ? null}:
{stdenv, subversion, glibcLocales, sshSupport ? false, openssh ? null}:
{url, rev ? "HEAD", md5 ? "", sha256 ? "",
ignoreExternals ? false, ignoreKeywords ? false, name ? null}:
@ -31,7 +31,7 @@ else
stdenv.mkDerivation {
name = name_;
builder = ./builder.sh;
buildInputs = [subversion];
buildInputs = [ subversion glibcLocales ];
outputHashAlgo = "sha256";
outputHashMode = "recursive";