Merge pull request #13053 from zimbatm/git-regexp-fix

git: fix references to gettext in bash scripts
This commit is contained in:
zimbatm 2016-02-16 21:18:39 +00:00
commit 5273dbf530

View File

@ -85,6 +85,10 @@ stdenv.mkDerivation {
-e 's| perl -e| ${perl}/bin/perl -e|g' \
$out/libexec/git-core/{git-am,git-submodule}
# Fix references to gettext.
substituteInPlace $out/libexec/git-core/git-sh-i18n \
--replace 'gettext.sh' '${gettext}/bin/gettext.sh'
# gzip (and optionally bzip2, xz, zip) are runtime dependencies for
# gitweb.cgi, need to patch so that it's found
sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \