summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-11-28 13:25:04 +0100
committerLudovic Courtès <ludo@gnu.org>2017-11-28 13:25:04 +0100
commit91c619ebdfd065f0becbbcc742dc412dc41e77a1 (patch)
treed8edc077e365ea575ff0441690bd6aa046737522
parent65c0f43649b455db94f1e8b0a244a889cb961b25 (diff)
downloadguix-91c619ebdfd065f0becbbcc742dc412dc41e77a1.tar.gz
gnu: guix: Provide the correct version string.
Fixes <https://bugs.gnu.org/29429>.
Reported by Arun Isaac <arunisaac@systemreboot.net>.

* gnu/packages/package-management.scm (guix)[arguments]: Move
'bootstrap' phase before 'configure'.  Create '.tarball-version' file.
-rw-r--r--gnu/packages/package-management.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 15c310d6e6..6d18fa0782 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -136,13 +136,17 @@
                     (ice-9 rdelim))
 
          #:phases (modify-phases %standard-phases
-                    (add-after 'unpack 'bootstrap
+                    (add-before 'configure 'bootstrap
                       (lambda _
                         ;; Make sure 'msgmerge' can modify the PO files.
                         (for-each (lambda (po)
                                     (chmod po #o666))
                                   (find-files "." "\\.po$"))
 
+                        (call-with-output-file ".tarball-version"
+                          (lambda (port)
+                            (display ,version port)))
+
                         (zero? (system* "sh" "bootstrap"))))
                     (add-before
                         'configure 'copy-bootstrap-guile