From unknown Sat Sep 13 11:13:15 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#52521] [PATCH] gnu: Make GNOME Shell Extensions configurable again. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Dec 2021 19:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52521 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52521@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163959732728476 (code B ref -1); Wed, 15 Dec 2021 19:43:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Dec 2021 19:42:07 +0000 Received: from localhost ([127.0.0.1]:33752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxaAA-0007PE-Ul for submit@debbugs.gnu.org; Wed, 15 Dec 2021 14:42:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:57188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxaA8-0007Oz-P7 for submit@debbugs.gnu.org; Wed, 15 Dec 2021 14:42:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxaA8-0004OW-J5 for guix-patches@gnu.org; Wed, 15 Dec 2021 14:42:04 -0500 Received: from [2a00:1450:4864:20::442] (port=40945 helo=mail-wr1-x442.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxa9z-0006qW-SS for guix-patches@gnu.org; Wed, 15 Dec 2021 14:42:04 -0500 Received: by mail-wr1-x442.google.com with SMTP id t9so40054165wrx.7 for ; Wed, 15 Dec 2021 11:41:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=kl2U0JKQoncnJX6onWS2/Oz2ro/JqYWh5NnwSn2AmAU=; b=MnZEnI2GNtE/olMp6Jh8W2bq3Ee817acLTYHqqlgBrWLQai4A/ihOqI72FURjxB6Hu XZ5pdMmZgfCpo4ax7/upzyfJeDTfDhGHztBYMbFo+zuMpGKYYFQmCtVo9toiOqvMd8Fm 6TM31+ICeG3F07J0PbAMTrA4zOiQHkGaQx4409Bax1moHDgQWI97WZSThYlqvom/IA7m gIdmyyiLdPBtHEP5ElwdUDFIH0ENjNtwITwrDYUvFrXoSZwdGBiVjof8spKRVDur5oRM JqvKuj7gggbMohqIOcHTC/heqtcqz3TRP4kqNSMuZLtKt0vDBZzPpE0jxlbBsw6NWcUZ 2/6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=kl2U0JKQoncnJX6onWS2/Oz2ro/JqYWh5NnwSn2AmAU=; b=7tKohFv+OFEDiJdnqOMPCaRGDruPfNKUiM/8P15vlHOUfNjBKmSvBBg+jC5UFND2Mr S/LJ7udkLJ/4jcL31+6ZHebQB9JS672p4dkMBqLFhyu635s6/kI1iP4LM1UUOVhG9mPd nQ5LUMQ2ZvyWngRlCem69Q77MnLmDzyQrzPZW5TeBP7D2QCyyu3beu8tr7LWaZ5ppFDc Jg0H7FMKeBg+0JKjrUopoEln5PLKfCvuaZIlQuM9GpWWsOOU6A9klyGz5qu8OAzdn3wR 7c8SnkQiRdYdl3tCZgfWoOVQXn5MYd6asBNzwWW/Yud+cqS5IjJzhnZ359E8yt7DRcVH PjtQ== X-Gm-Message-State: AOAM531otu/mFSd9Ggmr9jf38mb33eBTKRn7QXhkyE7FcKhvcAe5bnFF 4GDrPEUK3eXaRv05z0aW1mP8ThNr8rw= X-Google-Smtp-Source: ABdhPJzyM9YvnVj4JXKzClSfYq3IfENdiVNlgw2NRfRxHQfh3D1RVlgLfdvdxW94b23NzVMuLjIGyQ== X-Received: by 2002:adf:eac8:: with SMTP id o8mr4813615wrn.93.1639597314211; Wed, 15 Dec 2021 11:41:54 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e7sm3589264wrg.31.2021.12.15.11.41.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 11:41:53 -0800 (PST) From: Liliana Marie Prikler Date: Wed, 15 Dec 2021 20:40:09 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-ID: <9594ebfc0ddb823ce5a55724644b42508e00abb2.camel@gmail.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::442 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=liliana.prikler@gmail.com; helo=mail-wr1-x442.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/gnome.scm (gnome-shell)[#:phases]: Adjust ‘wrap’ phase, so that “gnome-extensions-app” gets GI_TYPELIB_PATH set. Add ‘rewire’ phase to replace the blurb that deprecated commands print in favour of one that doesn't point towards external packages. --- gnu/packages/gnome.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bbc768527d..46ab07c7ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8710,14 +8710,38 @@ (define-public gnome-shell (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) (python-path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append out "/bin/gnome-shell") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) + (for-each + (lambda (prog) + (wrap-program (string-append out "/bin/" prog) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + '("gnome-shell" "gnome-extensions-app")) + (substitute* (string-append out "/share/gnome-shell/" + "org.gnome.Shell.Extensions") + (("imports\\.package\\.start" all) + (string-append "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));\n" + all))) (for-each (lambda (prog) (wrap-program (string-append out "/bin/" prog) `("GUIX_PYTHONPATH" ":" prefix (,python-path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) - '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))))) + '("gnome-shell-perf-tool"))))) + (add-after 'install 'rewire + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (lambda (tool) + (call-with-output-file (string-append + (assoc-ref outputs "out") + "/bin/" tool) + (lambda (port) + (format port "#!~a +printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ +\"gnome-extensions-app\" instead.\\n'" + (search-input-file inputs "bin/bash") + tool)))) + '("gnome-shell-extension-tool" "gnome-shell-extension-prefs")))) (replace 'glib-or-gtk-wrap (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap))) (lambda* (#:key inputs outputs #:allow-other-keys #:rest rest) -- 2.34.0 From unknown Sat Sep 13 11:13:15 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Liliana Marie Prikler Subject: bug#52521: closed (Re: [PATCH] gnu: Make GNOME Shell Extensions configurable again.) Message-ID: References: <9594ebfc0ddb823ce5a55724644b42508e00abb2.camel@gmail.com> X-Gnu-PR-Message: they-closed 52521 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 52521@debbugs.gnu.org Date: Fri, 31 Dec 2021 14:08:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1640959682-29595-1" This is a multi-part message in MIME format... ------------=_1640959682-29595-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #52521: [PATCH] gnu: Make GNOME Shell Extensions configurable again. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 52521@debbugs.gnu.org. --=20 52521: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D52521 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1640959682-29595-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 52521-done) by debbugs.gnu.org; 31 Dec 2021 14:07:46 +0000 Received: from localhost ([127.0.0.1]:55441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3IZO-0007gn-In for submit@debbugs.gnu.org; Fri, 31 Dec 2021 09:07:46 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:51796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n3IZN-0007gV-0R for 52521-done@debbugs.gnu.org; Fri, 31 Dec 2021 09:07:45 -0500 Received: by mail-wm1-f65.google.com with SMTP id e5so17003369wmq.1 for <52521-done@debbugs.gnu.org>; Fri, 31 Dec 2021 06:07:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:date:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=g88XRttWwF5ShEmb2SJzt/JCsjxQy0DE7eY4yIUdE/A=; b=SEKWwSPrzppl19BldYcEkI9r8LaWwTWfMwFhWUUjWvLrhoyx3JK7nXULtqs2xOmXi2 W89pT9cF30cSBJr1ohcY9Ba6+7a3OGizyPqRJNY5j6hYjGdGi6WUobpnfuSuFO6gMxEz FfmRSWiSR+4V9AUZM4GImrJE3egOUU5LWuISyBv5Cu6guQ3ohwTCVhZKBpuymcQ4DXhk VB/xOqyf3FtX0ETApzKKaQIbTYKSulaH3SSth12Mg8phXyHy/p/BFvVsSyOY2Mp9GJYa tR/ouxpWESP08DVYn+Dar6Tp4OwWXoVmgkdVKqrDdLSLXpFMFLsdYYalhxPpUytQYcBK dKEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=g88XRttWwF5ShEmb2SJzt/JCsjxQy0DE7eY4yIUdE/A=; b=i7BILMtu5/6aX1UdcmIEshEItY+WPTPejzMppF5NexeoQ2it2v8XPHBLPGKAS6UNs7 r4nJo0/J6f+ZT/nxuuHh7cBfaQ1EYnN0IManVhLpuygKH5/DMHMxe/gZ16DVOU+Yk7LZ CclB0tuLiNcmcfLOlOiEvRwieAeT1xXToEKFuXx58ekN4e/yCSfcr/28Jm+mOEz/Jq5G 7JY90XauActirfJ5KdpcUER61hnAK/msTQ6gdi8v6lvskHNNx6Y+xruiTastQVIkkkFw zHaASiprGYa/atTLctNbPUgiioaYEicPNChlsocIzmvRe3S8Ykp/657UVn/OWegL/Jlf vu4w== X-Gm-Message-State: AOAM531av2kdN6ItOso0/+VBDOS/oqgf6Q5ROeKHe5rmur6MatGF3D8M GGyR7tthFt/ZicQpwI1iENWfAWu05G29Ow== X-Google-Smtp-Source: ABdhPJwh7is5P75hfNnW3YRVdiYlZvJoOMF+WtsTpUz5cLeMHgUKY8tMgVTTxFidD5OgzcTqTpr3ZA== X-Received: by 2002:a1c:2085:: with SMTP id g127mr30016960wmg.120.1640959659469; Fri, 31 Dec 2021 06:07:39 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l26sm26562813wrz.44.2021.12.31.06.07.38 for <52521-done@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Dec 2021 06:07:39 -0800 (PST) Message-ID: Subject: Re: [PATCH] gnu: Make GNOME Shell Extensions configurable again. From: Liliana Marie Prikler To: 52521-done@debbugs.gnu.org Date: Fri, 31 Dec 2021 15:07:38 +0100 In-Reply-To: <9594ebfc0ddb823ce5a55724644b42508e00abb2.camel@gmail.com> References: <9594ebfc0ddb823ce5a55724644b42508e00abb2.camel@gmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.42.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Am Mittwoch, dem 15.12.2021 um 20:40 +0100 schrieb Liliana Marie Prikler: > * gnu/packages/gnome.scm (gnome-shell)[#:phases]: Adjust ‘wrap’ > phase, so > that “gnome-extensions-app” gets GI_TY [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.3 RCVD_IN_VALIDITY_RPBL RBL: Relay in Validity RPBL, https://senderscore.org/blocklistlookup/ [209.85.128.65 listed in bl.score.senderscore.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.128.65 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.128.65 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 52521-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Am Mittwoch, dem 15.12.2021 um 20:40 +0100 schrieb Liliana Marie Prikler: > * gnu/packages/gnome.scm (gnome-shell)[#:phases]: Adjust ‘wrap’ > phase, so > that “gnome-extensions-app” gets GI_TYPELIB_PATH set. > Add ‘rewire’ phase to replace the blurb that deprecated commands > print in > favour of one that doesn't point towards external packages. Done and pushed. ------------=_1640959682-29595-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 15 Dec 2021 19:42:07 +0000 Received: from localhost ([127.0.0.1]:33752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxaAA-0007PE-Ul for submit@debbugs.gnu.org; Wed, 15 Dec 2021 14:42:07 -0500 Received: from lists.gnu.org ([209.51.188.17]:57188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxaA8-0007Oz-P7 for submit@debbugs.gnu.org; Wed, 15 Dec 2021 14:42:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxaA8-0004OW-J5 for guix-patches@gnu.org; Wed, 15 Dec 2021 14:42:04 -0500 Received: from [2a00:1450:4864:20::442] (port=40945 helo=mail-wr1-x442.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxa9z-0006qW-SS for guix-patches@gnu.org; Wed, 15 Dec 2021 14:42:04 -0500 Received: by mail-wr1-x442.google.com with SMTP id t9so40054165wrx.7 for ; Wed, 15 Dec 2021 11:41:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=kl2U0JKQoncnJX6onWS2/Oz2ro/JqYWh5NnwSn2AmAU=; b=MnZEnI2GNtE/olMp6Jh8W2bq3Ee817acLTYHqqlgBrWLQai4A/ihOqI72FURjxB6Hu XZ5pdMmZgfCpo4ax7/upzyfJeDTfDhGHztBYMbFo+zuMpGKYYFQmCtVo9toiOqvMd8Fm 6TM31+ICeG3F07J0PbAMTrA4zOiQHkGaQx4409Bax1moHDgQWI97WZSThYlqvom/IA7m gIdmyyiLdPBtHEP5ElwdUDFIH0ENjNtwITwrDYUvFrXoSZwdGBiVjof8spKRVDur5oRM JqvKuj7gggbMohqIOcHTC/heqtcqz3TRP4kqNSMuZLtKt0vDBZzPpE0jxlbBsw6NWcUZ 2/6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=kl2U0JKQoncnJX6onWS2/Oz2ro/JqYWh5NnwSn2AmAU=; b=7tKohFv+OFEDiJdnqOMPCaRGDruPfNKUiM/8P15vlHOUfNjBKmSvBBg+jC5UFND2Mr S/LJ7udkLJ/4jcL31+6ZHebQB9JS672p4dkMBqLFhyu635s6/kI1iP4LM1UUOVhG9mPd nQ5LUMQ2ZvyWngRlCem69Q77MnLmDzyQrzPZW5TeBP7D2QCyyu3beu8tr7LWaZ5ppFDc Jg0H7FMKeBg+0JKjrUopoEln5PLKfCvuaZIlQuM9GpWWsOOU6A9klyGz5qu8OAzdn3wR 7c8SnkQiRdYdl3tCZgfWoOVQXn5MYd6asBNzwWW/Yud+cqS5IjJzhnZ359E8yt7DRcVH PjtQ== X-Gm-Message-State: AOAM531otu/mFSd9Ggmr9jf38mb33eBTKRn7QXhkyE7FcKhvcAe5bnFF 4GDrPEUK3eXaRv05z0aW1mP8ThNr8rw= X-Google-Smtp-Source: ABdhPJzyM9YvnVj4JXKzClSfYq3IfENdiVNlgw2NRfRxHQfh3D1RVlgLfdvdxW94b23NzVMuLjIGyQ== X-Received: by 2002:adf:eac8:: with SMTP id o8mr4813615wrn.93.1639597314211; Wed, 15 Dec 2021 11:41:54 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id e7sm3589264wrg.31.2021.12.15.11.41.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 11:41:53 -0800 (PST) From: Liliana Marie Prikler Date: Wed, 15 Dec 2021 20:40:09 +0100 Subject: [PATCH] gnu: Make GNOME Shell Extensions configurable again. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 to: guix-patches@gnu.org Content-Transfer-Encoding: 8bit Message-ID: <9594ebfc0ddb823ce5a55724644b42508e00abb2.camel@gmail.com> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::442 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=liliana.prikler@gmail.com; helo=mail-wr1-x442.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/packages/gnome.scm (gnome-shell)[#:phases]: Adjust ‘wrap’ phase, so that “gnome-extensions-app” gets GI_TYPELIB_PATH set. Add ‘rewire’ phase to replace the blurb that deprecated commands print in favour of one that doesn't point towards external packages. --- gnu/packages/gnome.scm | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bbc768527d..46ab07c7ac 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8710,14 +8710,38 @@ (define-public gnome-shell (let ((out (assoc-ref outputs "out")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) (python-path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append out "/bin/gnome-shell") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) + (for-each + (lambda (prog) + (wrap-program (string-append out "/bin/" prog) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + '("gnome-shell" "gnome-extensions-app")) + (substitute* (string-append out "/share/gnome-shell/" + "org.gnome.Shell.Extensions") + (("imports\\.package\\.start" all) + (string-append "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));\n" + all))) (for-each (lambda (prog) (wrap-program (string-append out "/bin/" prog) `("GUIX_PYTHONPATH" ":" prefix (,python-path)) `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) - '("gnome-shell-extension-tool" "gnome-shell-perf-tool"))))) + '("gnome-shell-perf-tool"))))) + (add-after 'install 'rewire + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each + (lambda (tool) + (call-with-output-file (string-append + (assoc-ref outputs "out") + "/bin/" tool) + (lambda (port) + (format port "#!~a +printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ +\"gnome-extensions-app\" instead.\\n'" + (search-input-file inputs "bin/bash") + tool)))) + '("gnome-shell-extension-tool" "gnome-shell-extension-prefs")))) (replace 'glib-or-gtk-wrap (let ((wrap (assoc-ref %standard-phases 'glib-or-gtk-wrap))) (lambda* (#:key inputs outputs #:allow-other-keys #:rest rest) -- 2.34.0 ------------=_1640959682-29595-1--