Merge branch 'master' into staging

2016-02-17 10:06:31 +01:00
parent ee994dfae6 2f3eae3a87
commit e9520e81b3
456 changed files with 22536 additions and 2438 deletions
@@ -83,6 +83,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'|" \