guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: gnu: geeqie: Remove custom bootstrap phase.


From: guix-commits
Subject: 02/03: gnu: geeqie: Remove custom bootstrap phase.
Date: Wed, 23 Jan 2019 15:46:14 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit 027f97b13f0de9a539a1d3c9edc0c3b4c0673f0f
Author: Ricardo Wurmus <address@hidden>
Date:   Wed Jan 23 21:40:42 2019 +0100

    gnu: geeqie: Remove custom bootstrap phase.
    
    * gnu/packages/image-viewers.scm (geeqie)[arguments]: Remove invocation of
    autogen.sh script; rename "autogen" phase to "pre-bootstrap".
---
 gnu/packages/image-viewers.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index ce9e2b3..ca7eb7a 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2017 Mathieu Othacehe <address@hidden>
 ;;; Copyright © 2017 nee <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
-;;; Copyright © 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2018, 2019 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -126,21 +126,18 @@ actions.")
 
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'autogen
+         (add-before 'bootstrap 'pre-bootstrap
            (lambda _
              (define (write-dummy-changelog port)
                (display "See Git history for a change log.\n" port))
-
-             (setenv "NOCONFIGURE" "true")
-
              ;; Create ChangeLog{,.html} to placate the makefile, which would
              ;; otherwise require access to the Git repo.
              (call-with-output-file "ChangeLog"
                write-dummy-changelog)
              (call-with-output-file "ChangeLog.html"
                write-dummy-changelog)
-
-             (zero? (system* "sh" "autogen.sh")))))))
+             (setenv "NOCONFIGURE" "true")
+             #t)))))
     (inputs
      `(("clutter" ,clutter)
        ("libchamplain" ,libchamplain)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]