all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* bug#26593: [PATCH] gnu: icecat: Fix GTK 3 file chooser crash.
@ 2017-04-21 17:55 Clément Lassieur
  2017-04-21 18:18 ` Clément Lassieur
  0 siblings, 1 reply; 2+ messages in thread
From: Clément Lassieur @ 2017-04-21 17:55 UTC (permalink / raw)
  To: 26593

* gnu/packages/gnuzilla.scm (icecat)[arguments]: Add a 'wrap-xdgdatadirs'
phase to set XDG_DATA_DIRS.
---
 gnu/packages/gnuzilla.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 91bb0a6a7..3b8c80d2c 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -750,7 +750,16 @@ 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"))))))
+         ;; This fixes the file chooser crash that happens with GTK 3.
+         (add-after 'install 'wrap-xdgdatadirs
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (lib (string-append out "/lib"))
+                    (gtk (assoc-ref inputs "gtk+"))
+                    (gtk-share (string-append gtk "/share")))
+               (wrap-program (car (find-files lib "^icecat$"))
+                 `("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))))
     (home-page "https://www.gnu.org/software/gnuzilla/")
     (synopsis "Entirely free browser derived from Mozilla Firefox")
     (description
-- 
2.12.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#26593: [PATCH] gnu: icecat: Fix GTK 3 file chooser crash.
  2017-04-21 17:55 bug#26593: [PATCH] gnu: icecat: Fix GTK 3 file chooser crash Clément Lassieur
@ 2017-04-21 18:18 ` Clément Lassieur
  0 siblings, 0 replies; 2+ messages in thread
From: Clément Lassieur @ 2017-04-21 18:18 UTC (permalink / raw)
  To: 26593


Clément Lassieur <clement@lassieur.org> writes:

> * gnu/packages/gnuzilla.scm (icecat)[arguments]: Add a 'wrap-xdgdatadirs'
> phase to set XDG_DATA_DIRS.
> ---
>  gnu/packages/gnuzilla.scm | 11 ++++++++++-
>  1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
> index 91bb0a6a7..3b8c80d2c 100644
> --- a/gnu/packages/gnuzilla.scm
> +++ b/gnu/packages/gnuzilla.scm
> @@ -750,7 +750,16 @@ 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"))))))
> +         ;; This fixes the file chooser crash that happens with GTK 3.
> +         (add-after 'install 'wrap-xdgdatadirs
                                     ^
I guess I should rename it to 'wrap-program, and update changelog
accordingly.

> +           (lambda* (#:key inputs outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (lib (string-append out "/lib"))
> +                    (gtk (assoc-ref inputs "gtk+"))
> +                    (gtk-share (string-append gtk "/share")))
> +               (wrap-program (car (find-files lib "^icecat$"))
> +                 `("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))))
>      (home-page "https://www.gnu.org/software/gnuzilla/")
>      (synopsis "Entirely free browser derived from Mozilla Firefox")
>      (description

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-04-21 18:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-21 17:55 bug#26593: [PATCH] gnu: icecat: Fix GTK 3 file chooser crash Clément Lassieur
2017-04-21 18:18 ` Clément Lassieur

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.