From patchwork Thu Mar 6 08:44:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 39729 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 C007227BBE2; Thu, 6 Mar 2025 08:50:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 2B85E27BBEA for ; Thu, 6 Mar 2025 08:50:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq6ur-0004Sb-C2; Thu, 06 Mar 2025 03:49:17 -0500 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 1tq6uf-0004Qq-F3 for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:06 -0500 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 1tq6ue-0003Wc-2S for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=aTtfmeIq8acXyXFA+totnJvCq14FUExr20OYfnkVtG8=; b=XibIW9Pf/F6N9cHIKfxsCIbsbjar3V1WRbu4df7wmR+KJL74M9pDZCaO7SSu73rLiDyk7D0zvJnzoHlSmEhaWSgyIyWJy/fQcvJDDO1/0GzWCzqO3gl8M6GlbxSO5KKkIhwKzJeMhIGE44e9S8H9NHo/Wj10ypZXHrCEKCDHtj+uICxoWxFjBuMONAhVpsFZDy1aa+KwA6V2o9SyfaPvPstwShOQhWcNcPIraYCOu9kXCYDSrakCuZPFhY8xOt+yXDoU+oLDLAfIFRvtyWTa6BraguPpz7kalywyF9VVo9Pw8FVKKRtJG6qNpLkj8WCOIuvZy7wHqDJolRhu7Z9SFw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq6ud-00028e-0i; Thu, 06 Mar 2025 03:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76572] [PATCH v2 1/4] gnu: gnome-shell-extension-gsconnect: Fix search path patching. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 06 Mar 2025 08:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76572@debbugs.gnu.org Cc: aurtzy , aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 76572-submit@debbugs.gnu.org id=B76572.17412509188131 (code B ref 76572); Thu, 06 Mar 2025 08:49:02 +0000 Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:38 +0000 Received: from localhost ([127.0.0.1]:41397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tq6uD-000275-So for submit@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:38 -0500 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:47404) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tq6u6-00026F-98 for 76572@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:31 -0500 Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-47521af4422so1319561cf.3 for <76572@debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741250903; x=1741855703; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aTtfmeIq8acXyXFA+totnJvCq14FUExr20OYfnkVtG8=; b=g4368SHT686oKJ2D7iaTgZwlSCXHKVcjH0kwKfjmn2YvqpPONmMbzPZkBihQGn6x/1 5WU7vyGva5Z95C/c8Im3ui6ng3GiSVcLRoR5+iITcBeQmMXS98yUR2o4wtlr242a6On8 DRsYdIoI8gCgCM/duDbzHBAtSpKeCjSpmbQxAzNyfWmHA5ARlyKIgNL1ZAeVcjCMh/ny rTcKSCOlvHjfld1bXaA85s+IN5PQXqPngfoFpYJktZ1RnaRgK8zz6kQTkQQ+MR6l58FZ vZMsuTsDQpjXmYTxgocYC/UbLP0gDqyg63e7sAj6xos6jGjx/pbDG4Y/MmxCV/pWCf/v JtRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741250903; x=1741855703; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aTtfmeIq8acXyXFA+totnJvCq14FUExr20OYfnkVtG8=; b=IrQaq3IDEgqmy/4KbmSBC91dBE19p0hUJ12GiysyPsWzP6HpVy+5ENPAvJS32N3gLg VyJZx+GOO5QMX9znN1BC+bDqMevMHld3pp/aM2hWJP0MTpmYLgkZC+olOpYUHsGB3RqZ jI5blY9Vt7PLQBmXNiwq3lavTj3XR8UHEk+mlf0DWZYoF6KPIP4GrEHQY45co+jsl7Za /F6mIrfQ4ne0kZwSweei8Yo+YHN3q7o4MHQHFv/MVGCYH1OypuXu8ky2zlnhhJqMiTnd sxyncQkQNrsKSfaHtd9jOqhKEexrWLsZwlvvPPhjehFnXUrmF4OFZNCpVdlkxTDMxD5z Hu/w== X-Gm-Message-State: AOJu0YywrItlurRRRr5qUZ+bO9AQ4q6g7uOdYoBglQWUaMKmv9oHl5GR EcG4Lc36Oy9gVdpA8tJleistwQrVlg7L8Ui3j6Md7QpEZ+ooHuTVHMX6lg== X-Gm-Gg: ASbGnctBDLANMYWniYNbEUK3Mk65Nz09q+U5XeDSEcTsiUzc/4yzdkbWfaRriBW7zg+ FeD5zd5SadFZxwEM8y6/kuWSyIXqftShP5outSiSzw2ddsN8CGs52APi0Hc+ntaCgkVGEUweNs6 hN9W8Rp8au0GefqmoG9fgwqsAmsi4nZLUWbmOEVzfxns2wHqmfj7ffXsoiaWg0gYWBA0wFPBQUN 0xjg3fS4G8dwAmVlXIdR2QsISfKWCgT98JMnnKDwkmCQwAcaz8nQ39C7EF+ZfuWTsD60/aBPSDL 06oxnHPnIVZEObOViQPZzZsks7BgeoIElm3M0gw= X-Google-Smtp-Source: AGHT+IEp87MVB/CDIZ86yH2JjmnI1x+UEOgSYn0dul7EUaWuzbHHlUL8lXTuLqvmQvND6O9uMNMCgw== X-Received: by 2002:ac8:7c45:0:b0:474:db2f:bd32 with SMTP id d75a77b69052e-4750b4b630emr92318891cf.38.1741250903484; Thu, 06 Mar 2025 00:48:23 -0800 (PST) Received: from localhost.localdomain ([2600:4808:a053:1800::4448]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4751db2f15dsm5183451cf.52.2025.03.06.00.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 00:48:22 -0800 (PST) From: aurtzy Date: Thu, 6 Mar 2025 03:44:50 -0500 Message-ID: <033b6e91689a129386f2722024378f884ac23b40.1741250406.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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 * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): [arguments]<#:phases>: Fix 'fix-paths phase substitutions no longer applying. Change-Id: I99aa0204c1dfad836aed62261d2ffc0c75366510 --- gnu/packages/gnome-xyz.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 92d8b7cb03..1a3a275db5 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2022 Sughosha ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 Eidvilas Markevičius +;;; Copyright © 2025 aurtzy ;;; ;;; This file is part of GNU Guix. ;;; @@ -766,15 +767,17 @@ (define-public gnome-shell-extension-gsconnect (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in" (("gapplication") gapplication)) - (for-each - (lambda (file) - (substitute* file - (("'use strict';") - (string-append "'use strict';\n\n" - "'" gi-typelib-path "'.split(':').forEach(" - "path => imports.gi.GIRepository.Repository." - "prepend_search_path(path));")))) - '("src/extension.js" "src/prefs.js"))))) + (for-each (lambda (file) + (with-atomic-file-replacement + file + (lambda (input output) + (format output "~a" + (string-append + "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));\n")) + (dump-port input output)))) + '("src/extension.js" "src/prefs.js"))))) (add-after 'install 'wrap-daemons (lambda _ (let* ((out #$output) From patchwork Thu Mar 6 08:44:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 39727 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 9F41A27BBE9; Thu, 6 Mar 2025 08:49:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 F04F227BBE2 for ; Thu, 6 Mar 2025 08:49:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq6uw-0004Tv-Bp; Thu, 06 Mar 2025 03:49:22 -0500 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 1tq6ue-0004Qp-C6 for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:06 -0500 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 1tq6ud-0003Wa-UT for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=n8RI46+FY5lkGwElTtMhYT8kJ+oSoi5ruHTd7rvbyfg=; b=cFkA3SOPQnybseCOxeJ67JhkXFBEOOGxALE58krwpMCWspAX8kwAHo2RrLjs+KW2h3X267p03VL7yasBBmdG6BV8oXViTTTAQNDkJBW6WE2SxEiMPeJxzLhmKBpe+hIllX6PuESTKmT1TDIemIJR0xUzHtiqDM13XytQKrtjaBAxv+2V/d6HA3runAiwxhfhBdufr5ptk7s80+Twy7DztgyHx29KDXxzdCaQkJvowYHJUhcMD197/iF+DEuv/a3qpJwrHKqpzVx5N/wxftX/jnrWtLEhcMvV/yz+gKN5KtLnFjMiuxm9XZ64h0IiE/zo8i1jGpvf7XsieWojjjMC0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq6ud-00028n-IN; Thu, 06 Mar 2025 03:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76572] [PATCH v2 2/4] gnu: gnome-shell-extension-gsconnect: Wrap gsconnect-preferences. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 06 Mar 2025 08:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76572@debbugs.gnu.org Cc: aurtzy , aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 76572-submit@debbugs.gnu.org id=B76572.17412509198144 (code B ref 76572); Thu, 06 Mar 2025 08:49:03 +0000 Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:39 +0000 Received: from localhost ([127.0.0.1]:41400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tq6uE-00027B-Fs for submit@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:38 -0500 Received: from mail-qk1-x729.google.com ([2607:f8b0:4864:20::729]:45365) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tq6u8-00026K-7z for 76572@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:32 -0500 Received: by mail-qk1-x729.google.com with SMTP id af79cd13be357-7c07cd527e4so34901085a.3 for <76572@debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741250906; x=1741855706; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=n8RI46+FY5lkGwElTtMhYT8kJ+oSoi5ruHTd7rvbyfg=; b=cJ18rzhOkuVHju6BZ1EyWkMLom1ETAIkGrOfCPZwAiD+unB5vIE2JSO8af32tuu6D0 k9C81F9IIPeQZ/CxlHRNVgPFUKOLH5+8g8SsweDUafRo+gCzBvMFH+Cq+g+uhQ0V8N9X In6QvuioLasI1PC1sTVha4BUo6v897WDCsPLEmSGKZPvE/lGpP611hihY76fu+PuRvCg kDXSTS6/FavXe+9SR99hFP70Yl4Qje8NRghU3cy82s67mCXrcNZJZ4XvKK/Odte+AIVC q8ce1yyb32zIt1rwo9FqsWlAUFQol+0IUAFQAzlxa85XxgB4uTbqrjcZ6nqHPK9w/mt2 Ju5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741250906; x=1741855706; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=n8RI46+FY5lkGwElTtMhYT8kJ+oSoi5ruHTd7rvbyfg=; b=o3yUlzBZUEZ+cE3vSwmcLvh2NOZEo3cZTAU9EU+9DlSz3fWKKoyvV1J0cvAxVV1VNI 0MG2wqK6Wj4XpMsdZk8n/p/rW5XWuFIv8cIkAtJspecmqtMaoabXeutkWXHXCd2sy7nC rfnlbqKOD8Jjq5EW3hBLnx265Weu8+EadbfSaub/zZkcHUJjHVtlkT9hJd43th1fi59d 1dlKXxgrmtFA0hoJQXpr/AgbrAMYm98O+u3sZsHghCLUdINJvi1rh2TOe9LwtgASlnu2 Q5GKeT1VCB+Nror7kbQ0x/4GSPWAFv6RndVE4XB0eRjquTqlDF1HMSKkiKIL2nUD7cp0 GBVg== X-Gm-Message-State: AOJu0YyM3MMPa7dvmutvur+GGxmkFFVpHUf5YbtWYK+puGKwRK/Eu+/W ycBaCl0eB7b4djJGNtpQ8F4gePEmjWeYF6E5saHvqJaHsAvUmmaDEtCZhw== X-Gm-Gg: ASbGncvO8BCRh5R39EvHWo898ZAmmUMgNZtF+I9xrxuTlyfnMIvI+lOwcb7FQ4phWEw cUN+ZliPyc56eeYU0fhZvoILESJp48EnkVvxJLFbDD5V/bWfvNqdB6O9H6rMEocx3Axy4R+Xsv/ x9vehJ+sG18ZACo1kBzCuR4nxP/npkte8Yrga/6ScRQhUt2rRcBjqx4kxx96R9SX3nkfCi0L7zf MANKutyZixxZ3Rawt+k7roJYAyekfHV03pIrFK7b+RnViyqUQM4r6T/Y8B0hk8cKMLzcITsEiIH G1V7hlGxwD9ubMvqJPUZTdgw/d0jD/hIpPvPg3A= X-Google-Smtp-Source: AGHT+IHSpAdlV3bJhhbXuRqGb/2Neead7YOtoF32l4LiC+s6mcjFc2AYysKULqMXm6NApHMUZI7Zlg== X-Received: by 2002:a05:620a:1a03:b0:7c3:dc4c:7789 with SMTP id af79cd13be357-7c3dc4c7a6fmr626030885a.42.1741250906034; Thu, 06 Mar 2025 00:48:26 -0800 (PST) Received: from localhost.localdomain ([2600:4808:a053:1800::4448]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4751db2f15dsm5183451cf.52.2025.03.06.00.48.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 00:48:25 -0800 (PST) From: aurtzy Date: Thu, 6 Mar 2025 03:44:51 -0500 Message-ID: <36e7a401b7209480c03cb87d5b5c8ef62bb601b0.1741250406.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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 This fixes an error when attempting to open the gsconnect-preferences application due to Typelib files not being found. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): [arguments]<#:phases>: Wrap gsconnect-preferences with GI_TYPELIB_PATH environment variable. Rename 'wrap-daemons phase to 'wrap-programs. Change-Id: Ib330766d46dba00a7c68fa3956b28223f07000f8 --- gnu/packages/gnome-xyz.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 1a3a275db5..359dc757fd 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -778,13 +778,16 @@ (define-public gnome-shell-extension-gsconnect "prepend_search_path(path));\n")) (dump-port input output)))) '("src/extension.js" "src/prefs.js"))))) - (add-after 'install 'wrap-daemons + (add-after 'install 'wrap-programs (lambda _ (let* ((out #$output) - (service-dir - (string-append out "/share/gnome-shell/extensions" - "/gsconnect@andyholmes.github.io/service")) + (gsconnect-dir (string-append + out "/share/gnome-shell/extensions" + "/gsconnect@andyholmes.github.io")) + (service-dir (string-append gsconnect-dir "/service")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append gsconnect-dir "/gsconnect-preferences") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) (wrap-program (string-append service-dir "/daemon.js") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) (inputs From patchwork Thu Mar 6 08:44:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 39730 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 521CE27BBE9; Thu, 6 Mar 2025 08:50:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 572BC27BBE2 for ; Thu, 6 Mar 2025 08:50:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq6uo-0004S5-Nh; Thu, 06 Mar 2025 03:49:14 -0500 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 1tq6uf-0004Qr-F3 for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:06 -0500 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 1tq6uf-0003Wp-3L for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=MVLH5hsov4yM1TsnPIZaL/Dv9eP77NWhiWfB6gAZIv4=; b=Z3MrQmNxS1UxvlbuRgXi+cNc8y6jaD7iAbak84xLWGZlW2pFjVZa4frnIjEZMndNYlzW558GXuDFwWDzLdPWiXrTuf2Sgg4baeKvTZNDmbc0i9c3buUOsI2X+E6JgNgHWtKOsQ2tyP7LALYjtmUI+zJt05Snm+J7B6io7vFJ/ktgum3RYYqTklJzRO/Spp3dkEtHExQY9ypv9fzitR9jUzxFTRFNkhNgsr2szKBfsTqCJiHMdhz+lhUIEW3QR5a7YlNtdenrR/f7tpX/32MJandf2nXCeYfU6Mmk4aRwJSvzqg4VnBe8p/R1u32cJzPcCz31P+6Dfm4Yf3aeIU09HQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq6ue-00028y-0t; Thu, 06 Mar 2025 03:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76572] [PATCH v2 3/4] gnu: gnome-shell-extension-gsconnect: Patch shebangs with gjs. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 06 Mar 2025 08:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76572@debbugs.gnu.org Cc: aurtzy , aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 76572-submit@debbugs.gnu.org id=B76572.17412509228156 (code B ref 76572); Thu, 06 Mar 2025 08:49:03 +0000 Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:42 +0000 Received: from localhost ([127.0.0.1]:41402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tq6uF-00027O-0z for submit@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:42 -0500 Received: from mail-qv1-xf29.google.com ([2607:f8b0:4864:20::f29]:59635) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tq6uA-00026S-Vb for 76572@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:35 -0500 Received: by mail-qv1-xf29.google.com with SMTP id 6a1803df08f44-6df83fd01cbso1618516d6.2 for <76572@debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741250909; x=1741855709; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MVLH5hsov4yM1TsnPIZaL/Dv9eP77NWhiWfB6gAZIv4=; b=EkYYO47d1OHnToALALvS54vYmR7BSms8ngC/CTL4zivkhwxB7i0nQF34zTPuEjZinL m8sQpmxQ8fFOgOkhydASzSxhw+xec5VLIExZKbH9inyPbw/j8tuoq0JagMLBiP64Wi3k WipgLnbw/KJ30ENo6R5c+b7I+o92aC8zZD+/wXeYZjkmL2je7ijGSQoicS1a43pz/WuI wr6ryEhrTnvS6f51oKpPpC1aj4ohi0cnX7pQNUKhYj2uqPuRhhkAesXIuB3GV4fA5AEm LJZf44nO0WLcpVzwX5G1daUTJ+joZmXQ+DzNn7eOY0yS57mQxWBd7CNyLEmWqI4KeXYz wXEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741250909; x=1741855709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MVLH5hsov4yM1TsnPIZaL/Dv9eP77NWhiWfB6gAZIv4=; b=voPG2TEIPr1A9Qh9PpDxy4rbZmq5VucFAM5unysDjrCdVyxd0g9MVLkc3dgRl9m7qC +pHVQumwhrN4PcrMfc16rkk9Cv1BaEaMBOvoqc7qZLqp3eD8ACALFM3yBJ38b+xJFNzL 7XQPumq9ZlC6Yjq/iRW684MrD3yEgrqcExkLneHld27gnDf4KF+sCnpHHdKgKUQDib5n F3e+2gBY1B+qYcO193q031z5iF7LsqOTb+LnmFZt8jAAE4kGpZc4hgrAe4IPXmgvQ8/c rNiQbh98ScWnOG1CxmaXR1X+ugmwuWORgFkGpMnJK+gOsL99lTl867627oOx0xOcOaVy aZow== X-Gm-Message-State: AOJu0YyHrFfYzF7bFuKYe04FRrEKQvh4YdGUxTmAGsirIlpTJM4rXrHk TaCrR3hjeZCo+zjHhj5DWQXOXkuFy+abujN0s4DJuWmkHxhPDQqFJfQ1cg== X-Gm-Gg: ASbGnctm3G0RiBiKxW+8XdP06ZG+Mrm6aoCIg/drzfSbAqRzhxzPCvGvJsDfMoEjzge 3ZdMnkJsVfsaQbMqnARwC8rMHy1ozJJVSyKfyY9BkPdDHPzfDvt2oAsfjyd7lJmtSBXo4LcDQHw FWEBtXjyKkveU1j+3D6g3qHMT9m0v4JqpdS5bAtjf/2PDDw+4O/q3OAKSonMzUndpFYUJjpbvbz LKdXPMI2s2LdQ7f9B+LkYLZE/XeXLKiphwuumde0mLhQQQuBg0v66nl91iat8EUeueZLw4sv5IH dadZ8iN8fK7+nlvO2GNC7HgA0+PpobsrwAfC0jc= X-Google-Smtp-Source: AGHT+IGEM1NCHqQeACr/+u39X17h+kARkoiZE1+HZpnSddY+7Z7D2gclHZTu1/jZCwgtcLzTTj2Uyg== X-Received: by 2002:a05:6214:212d:b0:6e4:2f7f:d0bb with SMTP id 6a1803df08f44-6e8e6cc5c74mr94399106d6.4.1741250908585; Thu, 06 Mar 2025 00:48:28 -0800 (PST) Received: from localhost.localdomain ([2600:4808:a053:1800::4448]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4751db2f15dsm5183451cf.52.2025.03.06.00.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 00:48:28 -0800 (PST) From: aurtzy Date: Thu, 6 Mar 2025 03:44:52 -0500 Message-ID: <1da0ded149587945d839379568152cc52efeeb28.1741250406.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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 The 'patch-shebangs phase does not handle shebangs of the form "/usr/bin/env -S", so we manually patch them to fix a not-found error. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): [arguments]<#:phases>: Add 'patch-gjs-shebangs phase to patch shebangs using "/usr/bin/env -S" to execute gjs. Change-Id: I6b84474e4976484f1203b7cf78fe5e882694cd22 --- gnu/packages/gnome-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 359dc757fd..09e73a9c0a 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -761,6 +761,19 @@ (define-public gnome-shell-extension-gsconnect "gtk_update_icon_cache: false") (("update_desktop_database: true") "update_desktop_database: false")))) + ;; TODO: Remove after 'patch-shebangs is fixed to handle '/usr/bin/env -S' + ;; shebangs (see bug#74450). + (add-after 'unpack 'patch-gjs-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (for-each (lambda (file) + (substitute* file + (("^#!/usr/bin/env -S gjs.*$") + (string-append "#!" (which "gjs") " -m")))) + '("installed-tests/minijasmine" + "src/gsconnect-preferences" + "src/service/nativeMessagingHost.js" + "src/service/daemon.js" + "webextension/gettext.js")))) (add-before 'configure 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (let ((gapplication (search-input-file inputs "/bin/gapplication")) From patchwork Thu Mar 6 08:44:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: aurtzy X-Patchwork-Id: 39728 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 7E1D127BBEB; Thu, 6 Mar 2025 08:50:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 F007827BBE2 for ; Thu, 6 Mar 2025 08:50:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tq6uo-0004S2-Md; Thu, 06 Mar 2025 03:49:14 -0500 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 1tq6ug-0004Qs-6t for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:06 -0500 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 1tq6uf-0003Wx-RB for guix-patches@gnu.org; Thu, 06 Mar 2025 03:49:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=CgCX2t3u38eARHpjJNt1YaAIlA1Ln4DGRc1h8aABYTs=; b=sfgALYlpTFcrm28Ma3Oab14P3HlITjYcdCuZzdzU5YiNQCUjj4XZ4oMpTrHv5xsMPT19+T+px33lCaijaZQAw6s7AZtG8TrE/nkBq+tBSiP+McNSL+38f7QUbI97UHjmLR3HAP2JbrKVRX8ACoG5Sfg41HT9XNhj1BgIFrr1+JkK4EglThjSvIzx/tOtf9ddhU5fO2t/aaElCI1QxSF5wGR5qNHVIafcJoSgnTq8QXv7+CZyTTnof/jqXpUTDCbQvlGGwSLw5J33BiO8k2XqaZIzhoAmoZ1T5/9b3PzGMop4OGqulPo084perQnAjl8kSj3v0De2hY36lpRcgXxoQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tq6ue-000299-GL; Thu, 06 Mar 2025 03:49:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76572] [PATCH v2 4/4] gnu: gnome-shell-extension-gsconnect: Fix paths in additional desktop file. Resent-From: aurtzy Original-Sender: "Debbugs-submit" Resent-CC: aurtzy@gmail.com, maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 06 Mar 2025 08:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76572 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76572@debbugs.gnu.org Cc: aurtzy , aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: aurtzy , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 76572-submit@debbugs.gnu.org id=B76572.17412509278168 (code B ref 76572); Thu, 06 Mar 2025 08:49:04 +0000 Received: (at 76572) by debbugs.gnu.org; 6 Mar 2025 08:48:47 +0000 Received: from localhost ([127.0.0.1]:41404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tq6uM-00027e-IS for submit@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:46 -0500 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]:50425) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tq6uE-00026o-3H for 76572@debbugs.gnu.org; Thu, 06 Mar 2025 03:48:38 -0500 Received: by mail-qt1-x830.google.com with SMTP id d75a77b69052e-47521c604efso2849321cf.0 for <76572@debbugs.gnu.org>; Thu, 06 Mar 2025 00:48:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741250912; x=1741855712; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CgCX2t3u38eARHpjJNt1YaAIlA1Ln4DGRc1h8aABYTs=; b=fCWhcSoBwJN+JbByIRhnPYqTHiMJV0AIfkiV1Ig0vmGe+gPpCHaeTMxVdB5ha+j51h g5JWZah34N5T9P21ED1+mQooFT4Fb9qXy/RTdAp2c2+m3v82o79CDIhfnd5b3yy9wZ4I tYgZKXyIjI6UH1hQRjNp213ObentBtHM5qR4OHhsKP4cActKDAJ8DQDprJTVoLWWdqoY LJMx2xgOfEZhFqPXI540JiLhiVzOk9d7hyGDUS+OXN1UleZGvLuzEXWcTwGlTYtye0mD 2sXyvCXMhhjiK2bj0AFfYjgfmskuF1grSbzurK/pelsFfcaDEzWD7VZJcpk2OpHAcM2i /OjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741250912; x=1741855712; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CgCX2t3u38eARHpjJNt1YaAIlA1Ln4DGRc1h8aABYTs=; b=t3QBAWkzvygx3JDQOsF53RkvvKiUuUPwyJAj86OW3PBwMvVkjs/ax6gTz1shgWSk7T gEi/QI90qtUQHixlKu8fY3I+SZdwuPqSHnOf7GqhB5FL8+o2UCV4SnnC9CgvHluJJSqi LsGBbWZ6nPZ9VmFKhLNNo96MfybyxU3b9n/JM/D2BDYY4zhBhDxFCgIH/0w/FnRJN3Vh TiLiMXqg17zFfhuG1ED6ysI0JsUnehWG+cio32kt0TkYWGlrTh5cPTXWxdytYJMn9Ck7 j6l/P7tqsuvI4HEx5iP7i3TSP2ge62RiOb45rZonsaNdSFXOa9xSNlmjeQYXOqB+ZXqP i7tw== X-Gm-Message-State: AOJu0YwYt3k6sNm4345WVHYQlSH5mB5sEJv/yeAMq6xf9LY+7n3xwe2Q Fur683VTcS+ZSK5uY1cPzEqsyfBzITCIX/l3BQu/KfEoL6uLqZwtds967w== X-Gm-Gg: ASbGncu29muZb9wjYKH7KV/DbEHNIHfOWR1H9W4+6sT8ULkbVtCU7Fn6xA8xwTLbkyV ZEcR6ud5/zo1YhYaxET+fNHyCftbyFw+kJk8TQiEVFXYnuMhU9n3ktuvteRig0hjbbt4BnqCntr dhiiZwRW1fss5jBSrzMaoDM2Vklh9/SWp22syryrDIoE+iexmLg4jhcm8cHrGaCWQIIfBYIsmuT OucQNs8aV2o0z0R+gasfsYUEhBXyexMey2TAzzc6hVFvgn1sbBrtBgsRAs9hEI3eIheT2C0Ci9P dTO4O54fLmuEAi6+hSS8+oP5cWZjRWZ+iCNSDzU= X-Google-Smtp-Source: AGHT+IFm64eCI5Iepa2OWOAYtA1XYoQnhehuGHS5wdmpR4fV4Mzahs43Yxv/tHOirSZc2JRVObKDuw== X-Received: by 2002:ac8:5153:0:b0:474:fa6e:ff3a with SMTP id d75a77b69052e-4750b4e0e47mr85581521cf.49.1741250912048; Thu, 06 Mar 2025 00:48:32 -0800 (PST) Received: from localhost.localdomain ([2600:4808:a053:1800::4448]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4751db2f15dsm5183451cf.52.2025.03.06.00.48.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 00:48:30 -0800 (PST) From: aurtzy Date: Thu, 6 Mar 2025 03:44:53 -0500 Message-ID: <446341581d2f75f3f86eec45ed3cffbc46be66bf.1741250406.git.aurtzy@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: 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 This fixes the gsconnect preferences button ("Mobile Settings") in the top-right quick-access menu not opening the preferences application. The window icon also displays properly with this commit. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): [arguments]<#:phases>: Patch gapplication path in an additional desktop file in 'fix-paths phase. Change-Id: I6b84474e4976484f1203b7cf78fe5e882694cd22 --- gnu/packages/gnome-xyz.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 09e73a9c0a..d3bf068dbc 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -778,8 +778,12 @@ (define-public gnome-shell-extension-gsconnect (lambda* (#:key inputs #:allow-other-keys) (let ((gapplication (search-input-file inputs "/bin/gapplication")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in" - (("gapplication") gapplication)) + (for-each + (lambda (file) + (substitute* file + (("gapplication") gapplication))) + '("data/org.gnome.Shell.Extensions.GSConnect.desktop.in" + "data/org.gnome.Shell.Extensions.GSConnect.Preferences.desktop.in")) (for-each (lambda (file) (with-atomic-file-replacement file