From 8833a647bbe444b7a981d0ff977f8132b7d6fddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 30 Nov 2017 11:14:34 +0100
Subject: [PATCH] gnu: guix: Move 'bootstrap' phase after 'unpack'.

Suggested by Mark H Weaver <mhw@netris.org>
at <https://lists.gnu.org/archive/html/guix-devel/2017-11/msg00389.html>.

* gnu/packages/package-management.scm (guix)[arguments]: Move
'bootstrap' phase back after 'unpack'.
---
 gnu/packages/package-management.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index ac697512d6..3bc0473b9f 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -136,13 +136,15 @@
                     (ice-9 rdelim))
 
          #:phases (modify-phases %standard-phases
-                    (add-before 'configure 'bootstrap
+                    (add-after 'unpack 'bootstrap
                       (lambda _
                         ;; Make sure 'msgmerge' can modify the PO files.
                         (for-each (lambda (po)
                                     (chmod po #o666))
                                   (find-files "." "\\.po$"))
 
+                        (patch-shebang "build-aux/git-version-gen")
+
                         (call-with-output-file ".tarball-version"
                           (lambda (port)
                             (display ,version port)))