GNU bug report logs - #76689
[PATCH gnome-team] gnu: Add cuttlefish.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76689 in the body.
You can then email your comments to 76689 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Herman Rimm <herman <at> rimm.ee>
To: guix-patches <at> gnu.org
Subject: [PATCH gnome-team] gnu: Add cuttlefish.
Date: Sun,  2 Mar 2025 19:40:29 +0100

* gnu/packages/fediverse.scm (cuttlefish): Add variable.

Change-Id: I600f105862495a23e3d821b71b61582a442cb2f1
---
 gnu/packages/fediverse.scm | 59 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/fediverse.scm b/gnu/packages/fediverse.scm
index c660483b560..9d0d4fbc65c 100644
--- a/gnu/packages/fediverse.scm
+++ b/gnu/packages/fediverse.scm
@@ -48,10 +48,69 @@ (define-module (gnu packages fediverse)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages serialization)
   #:use-module (gnu packages time)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
 
+(define-public cuttlefish
+  (package
+    (name "cuttlefish")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://gitlab.shinice.net/artectrex/Cuttlefish")
+              (commit "9e9b97ccbb27562c86637e5b413c28beacd8cd4d")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0fdkag4j66zaf2shbw4j6hspk6bw6b0kbd5l6wzvh3p7id7yj6qi"))
+       (modules '((guix build utils)))
+       (snippet
+        #~(begin (substitute* "data/ch.cuttlefish.app.gschema.xml"
+                   ;; Instance does not work properly.
+                   (("https://video.blender.org")
+                    "https://tilvids.com"))
+                 (substitute* "src/video-view.cpp"
+                   ;; Top-level "files" key has an empty list.
+                   (("\\[\"files\"\\]")
+                    "[\"streamingPlaylists\"][0][\"files\"]"))))))
+    (build-system meson-build-system)
+    (arguments (list #:glib-or-gtk? #t
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-after 'glib-or-gtk-wrap 'lib-vars-wrap
+                (lambda _
+                  (let ((gstvar "GST_PLUGIN_SYSTEM_PATH"))
+                    (wrap-program
+                      (string-append #$output "/bin/cuttlefish")
+                      `(,gstvar ":" suffix (,(getenv gstvar))))))))))
+    (native-inputs
+     (list desktop-file-utils
+           gettext-minimal ; msgfmt
+           (list glib "bin") ; glib-compile-resources
+           gsettings-desktop-schemas ; org.gnome.system.proxy schema
+           pkg-config))
+    (inputs (list gst-plugins-bad
+                  gst-plugins-good ; playbin plugin
+                  gstreamer
+                  gtk
+                  jsoncpp
+                  libadwaita
+                  libsoup-minimal-2))
+    (home-page "https://cuttlefish.ch")
+    (synopsis "GTK client for Peertube")
+    (description
+     "Cuttlefish is a desktop client for PeerTube, but will work on
+GNU/Linux-based phones (like the Librem 5 or Pinephone) as well.  We
+want the experience of watching PeerTube videos and using PeerTube in
+general to be better, by making a native application that will become
+the best and most efficient way to hook into the federation of
+interconnected video hosting services.")
+    ;; Logo distributed under the Creative Commons CCBY license.
+    (license license:gpl3+)))
+
 (define-public toot
   (package
     (name "toot")

base-commit: 7d977552742c6b8526079c3cac5610c883df52f1
-- 
2.48.1

Message #10 received at 76689-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim <at> guixotic.coop>
To: Herman Rimm <herman <at> rimm.ee>
Cc: 76689-done <at> debbugs.gnu.org
Subject: Re: bug#76689: [PATCH gnome-team] gnu: Add cuttlefish.
Date: Sat, 26 Jul 2025 21:47:30 +0900

Hi!

Herman Rimm <herman <at> rimm.ee> writes:

> * gnu/packages/fediverse.scm (cuttlefish): Add variable.

I made the following changes:

--8<---------------cut here---------------start------------->8---
modified   gnu/packages/fediverse.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2021 Taiju HIGASHI <higashi <at> taiju.info>
 ;;; Copyright © 2024 Sergio Durigan Junior <sergiodj <at> sergiodj.net>
 ;;; Copyright © 2025 Ashish SHUKLA <ashish.is <at> lostca.se>
+;;; Copyright © 2025 Herman Rimm <herman <at> rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -78,23 +79,23 @@ (define-public cuttlefish
                    (("\\[\"files\"\\]")
                     "[\"streamingPlaylists\"][0][\"files\"]"))))))
     (build-system meson-build-system)
-    (arguments (list #:glib-or-gtk? #t
-          #:phases
-          #~(modify-phases %standard-phases
-              (add-after 'glib-or-gtk-wrap 'lib-vars-wrap
-                (lambda _
-                  (let ((gstvar "GST_PLUGIN_SYSTEM_PATH"))
-                    (wrap-program
-                      (string-append #$output "/bin/cuttlefish")
-                      `(,gstvar ":" suffix (,(getenv gstvar))))))))))
+    (arguments
+     (list #:glib-or-gtk? #t
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'glib-or-gtk-wrap 'wrap-gst-plugins
+                 (lambda _
+                   (wrap-program (string-append #$output "/bin/cuttlefish")
+                     `(,gstvar ":" prefix
+                               (,(getenv "GST_PLUGIN_SYSTEM_PATH")))))))))
     (native-inputs
      (list desktop-file-utils
-           gettext-minimal ; msgfmt
-           (list glib "bin") ; glib-compile-resources
-           gsettings-desktop-schemas ; org.gnome.system.proxy schema
+           gettext-minimal              ;msgfmt
+           (list glib "bin")            ;glib-compile-resources
+           gsettings-desktop-schemas    ;org.gnome.system.proxy schema
            pkg-config))
     (inputs (list gst-plugins-bad
-                  gst-plugins-good ; playbin plugin
+                  gst-plugins-good      ;playbin plugin
                   gstreamer
                   gtk
                   jsoncpp
@@ -104,11 +105,10 @@ (define-public cuttlefish
     (synopsis "GTK client for Peertube")
     (description
      "Cuttlefish is a desktop client for PeerTube, but will work on
-GNU/Linux-based phones (like the Librem 5 or Pinephone) as well.  We
-want the experience of watching PeerTube videos and using PeerTube in
-general to be better, by making a native application that will become
-the best and most efficient way to hook into the federation of
-interconnected video hosting services.")
+GNU/Linux-based phones (like the Librem 5 or Pinephone) as well.  Cuttlefish
+aims to provide a better experience of watching PeerTube videos and using
+PeerTube in general, via an efficient native application that can hook into
+the federation of interconnected video hosting services.")
     ;; Logo distributed under the Creative Commons CCBY license.
     (license license:gpl3+)))
--8<---------------cut here---------------end--------------->8---

mostly simplifying out the marketing speech from the description, and
pushed as commit 0e47deee689.

+ a few more before pushing, such as adding bash-minimal to inputs for
the wrapper ('guix lint' caught that).

Thank you!

-- 
Maxim

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.