aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/gnuzilla.scm
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-03-23 02:44:17 -0400
committerMark H Weaver <mhw@netris.org>2018-03-23 04:42:27 -0400
commit3f27124eb3a3e373919ac42c3accf1cffa1d4c79 (patch)
treee68e677b5e18685bd781e278efc230289265c4ba /gnu/packages/gnuzilla.scm
parenta53ced66b1e2d8c5215658806fd34465641b8870 (diff)
downloadguix-3f27124eb3a3e373919ac42c3accf1cffa1d4c79.tar
guix-3f27124eb3a3e373919ac42c3accf1cffa1d4c79.tar.gz
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.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
-rw-r--r--gnu/packages/gnuzilla.scm12
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 3956d4360e..5a86c1196c 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 "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox")
(description