mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 07:31:26 +00:00
Merge pull request #13053 from zimbatm/git-regexp-fix
git: fix references to gettext in bash scripts
This commit is contained in:
commit
5273dbf530
@ -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'|" \
|
||||
|
Loading…
Reference in New Issue
Block a user