[Top][All Lists]

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

28/66: gnu: icecat: Return #t from all phases.

From: Mark H. Weaver
Subject: 28/66: gnu: icecat: Return #t from all phases.
Date: Fri, 23 Mar 2018 04:46:43 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 3f27124eb3a3e373919ac42c3accf1cffa1d4c79
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 23 02:44:17 2018 -0400

    gnu: icecat: Return #t from all phases.
    * gnu/packages/gnuzilla.scm (icecat)[arguments]: Return #t from the
    'install-icons' and 'wrap-program' phases.  Use 'invoke' in the custom
    configure phase.
 gnu/packages/gnuzilla.scm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 3956d43..5a86c11 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -672,9 +672,9 @@ security standards.")
               (chdir "../build")
               (format #t "build directory: ~s~%" (getcwd))
               (format #t "configure flags: ~s~%" flags)
-              (zero? (apply system* bash
-                            (string-append srcdir "/configure")
-                            flags)))))
+              (apply invoke bash
+                     (string-append srcdir "/configure")
+                     flags))))
          (add-before 'configure 'install-desktop-entry
            (lambda* (#:key outputs #:allow-other-keys)
              ;; Install the '.desktop' file.
@@ -729,7 +729,8 @@ security standards.")
                       (copy-file file (string-append icons "/icecat.png"))))
                   '("default16.png" "default22.png" "default24.png"
                     "default32.png" "default48.png" "content/icon64.png"
-                    "mozicon128.png" "default256.png"))))))
+                    "mozicon128.png" "default256.png"))
+                 #t))))
          ;; This fixes the file chooser crash that happens with GTK 3.
          (add-after 'install 'wrap-program
            (lambda* (#:key inputs outputs #:allow-other-keys)
@@ -738,7 +739,8 @@ security standards.")
                     (gtk (assoc-ref inputs "gtk+"))
                     (gtk-share (string-append gtk "/share")))
                (wrap-program (car (find-files lib "^icecat$"))
-                 `("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))))
+                 `("XDG_DATA_DIRS" ":" prefix (,gtk-share)))
+               #t))))))
     (home-page "";)
     (synopsis "Entirely free browser derived from Mozilla Firefox")

reply via email to

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