From patchwork Sun Apr 21 17:02:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariqq X-Patchwork-Id: 63281 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 605F827BBE2; Sun, 21 Apr 2024 18:11:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2564C1719D for ; Sun, 21 Apr 2024 18:11:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ryaiK-0002Ij-RD; Sun, 21 Apr 2024 13:10:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ryaiI-0002IR-9a for guix-patches@gnu.org; Sun, 21 Apr 2024 13:10:50 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ryaiH-0006ZI-JW for guix-patches@gnu.org; Sun, 21 Apr 2024 13:10:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ryaiW-0005vN-8F; Sun, 21 Apr 2024 13:11:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70282] [PATCH v3] gnu: gnome-shell: Wrap screencast service. References: In-Reply-To: Resent-From: Dariqq Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sun, 21 Apr 2024 17:11:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70282 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70282@debbugs.gnu.org Cc: Dariqq , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 70282-submit@debbugs.gnu.org id=B70282.171371940322346 (code B ref 70282); Sun, 21 Apr 2024 17:11:04 +0000 Received: (at 70282) by debbugs.gnu.org; 21 Apr 2024 17:10:03 +0000 Received: from localhost ([127.0.0.1]:43899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryahV-0005np-4m for submit@debbugs.gnu.org; Sun, 21 Apr 2024 13:10:03 -0400 Received: from mout02.posteo.de ([185.67.36.66]:50331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ryahP-0005mB-BK for 70282@debbugs.gnu.org; Sun, 21 Apr 2024 13:09:59 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 34014240103 for <70282@debbugs.gnu.org>; Sun, 21 Apr 2024 19:09:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1713719373; bh=nGFU/OKs9Kiz8bgO/nNqGAxAEagGoIv01jW4PmV5Pko=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=noP3IPhwGYN4HiWNYeSkyF6CqRswV1imfr4bR9R8d0YkUK9teiXfoe00zgrgQsFko hPcPc4OrdL4yeYMvUikubTnJB/5PE9FE4qZat4joHusfgxrBPVPtPdljQK5FfRLmzN aXKrSpcuBudtil1/SXxwXdHFcLxNnRzv0/Le9CSZ5h4Z21tSCAaLMF23fLIqNixiZj 5nvCYnjmDBbADRp2c2dLTE1x3m368bMqE41JJ8CilLcdVAPX+F+NXF7mmwJ5VN/kwL Ys3I2PXwHhmZhOs5GJyu0JP8GQUaHenlClfYSPdj7kkUcEa4VUmBaqJ4/KMOcU00Qn SYA89k5vVOrZA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4VMvxm5Q8Kz6tm4; Sun, 21 Apr 2024 19:09:32 +0200 (CEST) From: Dariqq Date: Sun, 21 Apr 2024 17:02:18 +0000 Message-ID: <79b8bcd870f61cc79518c4ff8bf560b88661e0b3.1713718938.git.dariqq@posteo.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Adjust screencast such that GI_TYPELIB_PATH and GST_PLUGIN_SYSTEM_PATH are set before starting. Add all required gstreamer plugins to inputs. To be able to use it a running pipewire service is needed. * gnu/packages/gnome.scm (gnome-shell): [inputs]: Add gst-plugins-good and pipewire. [#:phases]<'wrap-programs>: Wrap org.gnome.Shell.Screencast. Change-Id: I2c31bf1bd92e281b86c57b06988c6a3793a58d40 --- Here is v3 which only uses js to set the environment variables. Slight difference to before is that GST_PLUGIN_SYSTEM_PATH gets set to specific paths rather than prepending. I've also tested if GI_TYPELIB_PATH can be set with GLib.setenv but that didn't seem to work, so I 've used something similiar as in other places. gnu/packages/gnome.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) base-commit: a1d711c92e119f6b5b8e99a620cdba92a4ca3bfb diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 489f23865b..b3c3fb72ad 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9392,6 +9392,7 @@ (define-public gnome-shell (add-after 'install 'wrap-programs (lambda* (#:key inputs #:allow-other-keys) (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) (python-path (string-join (filter (lambda (item) @@ -9411,6 +9412,18 @@ (define-public gnome-shell "path => imports.gi.GIRepository.Repository." "prepend_search_path(path));\n" all))) + ;; Screencast requires a pipewire service running + ;; (i.e. as provided by home-pipewire-service-type) + (substitute* (string-append #$output "/share/gnome-shell/" + "org.gnome.Shell.Screencast") + (("imports\\.package\\.start" all) + (string-append "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));\n" + "imports.gi.GLib.setenv('GST_PLUGIN_SYSTEM_PATH'," + "'" gst-plugin-path "'" + ", true);\n" + all))) (for-each (lambda (prog) (wrap-program (string-append #$output "/bin/" prog) @@ -9476,6 +9489,7 @@ (define-public gnome-shell gnome-settings-daemon graphene gst-plugins-base + gst-plugins-good ibus libcanberra libcroco @@ -9486,6 +9500,7 @@ (define-public gnome-shell mesa-headers mutter network-manager-applet + pipewire polkit pulseaudio python-pygobject