diff mbox series

[bug#64521,2/2] gnu: tuba: Fix videoplayer crash and webp support.

Message ID e45dca52be7ff8d71589c151be9b53897a3cddc0.1688793035.git.lilah@lunabee.space
State New
Headers show
Series [bug#64521,1/2] gnu: tuba: Update to new style. | expand

Commit Message

Lilah Tascheter July 8, 2023, 5:11 a.m. UTC 
* gnu/packages/mastodon.scm (tuba)[arguments]<phases: Add lib-vars-wrap
  phase to set GST_PLUGIN_SYSTEM_PATH and GDK_PIXBUF_MODULE_FILE
  variables.

  (tuba)[native-inputs]: Add gdk-pixbuf.
  (tuba)[inputs]: Add gstreamer, plugins, and webp-pixbuf-loader.
---
 gnu/packages/mastodon.scm | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

Comments

Juliana Sims July 8, 2023, 4:57 p.m. UTC | #1 
This looks good to me - but of course, the final say is with the 
commiters :)

- Juli
Maxim Cournoyer July 10, 2023, 4:40 a.m. UTC | #2 
Hello,

Lilah Tascheter <lilah@lunabee.space> writes:

> * gnu/packages/mastodon.scm (tuba)[arguments]<phases: Add lib-vars-wrap
>   phase to set GST_PLUGIN_SYSTEM_PATH and GDK_PIXBUF_MODULE_FILE
>   variables.
>
>   (tuba)[native-inputs]: Add gdk-pixbuf.
>   (tuba)[inputs]: Add gstreamer, plugins, and webp-pixbuf-loader.

Applied this one and the precedent commit as
753428d7939bb5840d9e230215312d4bd5d487d3 and
88027480b537b391b5089fb06889835510f33e59, with minor cosmetic edits
(such as removing the whitespace in the above commit message).

Well done! :-)
diff mbox series

Patch

diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm
index af578bd7de..4442e6cb2a 100644
--- a/gnu/packages/mastodon.scm
+++ b/gnu/packages/mastodon.scm
@@ -33,6 +33,7 @@  (define-module (gnu packages mastodon)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
@@ -100,17 +101,29 @@  (define-public tuba
         #:configure-flags ''("-Ddistro=true")
         #:phases
         #~(modify-phases %standard-phases
-            (add-after 'glib-or-gtk-wrap 'symlink-package
+            (add-after 'glib-or-gtk-wrap 'lib-vars-wrap
+              (lambda _
+                (let ((gstvar "GST_PLUGIN_SYSTEM_PATH")
+                      (pixvar "GDK_PIXBUF_MODULE_FILE"))
+                  (wrap-program (string-append #$output "/bin/dev.geopjr.Tuba")
+                    `(,gstvar ":" suffix (,(getenv gstvar)))
+                    `(,pixvar ":" = (,(getenv pixvar)))))))
+            (add-after 'lib-vars-wrap 'symlink-package
               (lambda _
                 (with-directory-excursion
                   (string-append #$output "/bin")
                   (symlink "dev.geopjr.Tuba" "tuba")))))))
     (native-inputs
-     (list gettext-minimal
+     (list gdk-pixbuf ; so pixbuf loader cache (for webp) is generated
+           gettext-minimal
            `(,glib "bin") ; for glib-compile-resources
            pkg-config))
     (inputs
-     (list gtk
+     (list gst-plugins-bad
+           gst-plugins-base
+           gst-plugins-good
+           gstreamer
+           gtk
            gtksourceview
            json-glib
            libadwaita
@@ -119,7 +132,8 @@  (define-public tuba
            libsecret
            libwebp
            libxml2
-           vala))
+           vala
+           webp-pixbuf-loader))
     (home-page "https://tuba.geopjr.dev/")
     (synopsis "GTK client for Mastodon")
     (description "Tuba is a GTK client for Mastodon.  It provides a clean,