Merge pull request #13154 from zimbatm/git-rebase-fix-v2

git: fixes references to gettext properly
2016-02-26 00:03:17 +00:00
parent 853a213698 11733b39b5
commit 428e12d23f
2 changed files with 80 additions and 1 deletions
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
  patches = [
    ./docbook2texi.patch
    ./symlinks-in-bin.patch
+    ./git-sh-i18n.patch
  ];

  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
@@ -85,7 +86,7 @@ stdenv.mkDerivation {

      # Fix references to gettext.
      substituteInPlace $out/libexec/git-core/git-sh-i18n \
-          --replace 'gettext.sh' '${gettext}/bin/gettext.sh'
+          --subst-var-by gettext ${gettext}

      # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
      # gitweb.cgi, need to patch so that it's found