nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Mark H Weaver 2018-03-23 02:44:17 -04:00
parent a53ced66b1
commit 3f27124eb3
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/gnuzilla.scm
View File

@ -672,9 +672,9 @@ security standards.")
(chdir "../build") (chdir "../build")
(format #t "build directory: ~s~%" (getcwd)) (format #t "build directory: ~s~%" (getcwd))
(format #t "configure flags: ~s~%" flags) (format #t "configure flags: ~s~%" flags)
(zero? (apply system* bash (apply invoke bash
(string-append srcdir "/configure") (string-append srcdir "/configure")
flags))))) flags))))
(add-before 'configure 'install-desktop-entry (add-before 'configure 'install-desktop-entry
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Install the '.desktop' file. ;; Install the '.desktop' file.
@ -729,7 +729,8 @@ security standards.")
(copy-file file (string-append icons "/icecat.png")))) (copy-file file (string-append icons "/icecat.png"))))
'("default16.png" "default22.png" "default24.png" '("default16.png" "default22.png" "default24.png"
"default32.png" "default48.png" "content/icon64.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. ;; This fixes the file chooser crash that happens with GTK 3.
(add-after 'install 'wrap-program (add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -738,7 +739,8 @@ security standards.")
(gtk (assoc-ref inputs "gtk+")) (gtk (assoc-ref inputs "gtk+"))
(gtk-share (string-append gtk "/share"))) (gtk-share (string-append gtk "/share")))
(wrap-program (car (find-files lib "^icecat$")) (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/") (home-page "https://www.gnu.org/software/gnuzilla/")
(synopsis "Entirely free browser derived from Mozilla Firefox") (synopsis "Entirely free browser derived from Mozilla Firefox")
(description (description