[PATCH] gettext: Adjust autoconfPhase for the latest autogen.sh

[Daiki Ueno]

Hi,

Sorry for bothering you again, I realized that a couple of more fixes
are needed for building recent gettext-master.

First, the autogen.sh script downloads a ~3MB tarball from
alpha.gnu.org, which may cause timeout.  To avoid download error, we
create an empty tarball after running autogen.sh, but it is too late.
Secondly, we now use git submodule for Gnulib checkout and it would be
good to use the version instead of the Gnulib master.

Could you consider the attached patch?

Thanks,
--
Daiki Ueno

>From 96e2869df3fbbb90b730ac4d5689252dd7058f07 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <address@hidden>
Date: Mon, 21 Apr 2014 16:47:59 +0900
Subject: [PATCH] gettext: Adjust autoconfPhase for the latest autogen.sh

Prepare empty archive tarball before running autogen.sh and utilize
git submodule for Gnulib checkout.
---
 gettext/release.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gettext/release.nix b/gettext/release.nix
index d323e5b..0d12294 100644
--- a/gettext/release.nix
+++ b/gettext/release.nix
@@ -67,13 +67,16 @@ in
       tarball = pkgs: {
         patches = [ ./tar-should-not-expect-a-root-user.patch ];
         autoconfPhase = ''
-          export GNULIB_TOOL="../gnulib/gnulib-tool"
-          ./autogen.sh
-          # archive.dir.tar is not under version control; use empty
-          # tarball for building
+          # archive.dir.tar is not under version control; prepare an empty
+          # tarball before building
           : > dummy
           tar cf gettext-tools/misc/archive.dir.tar dummy
-          rm -f dummy        '';
+          rm -f dummy
+          # fetch gnulib from the local repository
+          git config submodule.gnulib.url "${<gnulib>}"
+          export GNULIB_SRCDIR="${<gnulib>}"
+          ./autogen.sh
+        '';
         buildInputs = with pkgs; [
           bison
           gettext_0_18 # needed for bootstrap
-- 
1.9.0