From patchwork Thu Jul 4 23:23:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smith X-Patchwork-Id: 28979 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 287C227BBE9; Fri, 5 Jul 2024 00:25:19 +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=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 F2EC527BBE2 for ; Fri, 5 Jul 2024 00:25:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sPVp2-0005rR-V5; Thu, 04 Jul 2024 19:25:04 -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 1sPVoz-0005qj-0H for guix-patches@gnu.org; Thu, 04 Jul 2024 19:25:01 -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 1sPVoy-0002kj-OP for guix-patches@gnu.org; Thu, 04 Jul 2024 19:25:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sPVp0-0003sN-FX; Thu, 04 Jul 2024 19:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71944] [PATCH 2/2] gnu: lollypop: Update package style. Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 04 Jul 2024 23:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71944 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71944@debbugs.gnu.org Cc: James Smith , Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 71944-submit@debbugs.gnu.org id=B71944.172013546514832 (code B ref 71944); Thu, 04 Jul 2024 23:25:02 +0000 Received: (at 71944) by debbugs.gnu.org; 4 Jul 2024 23:24:25 +0000 Received: from localhost ([127.0.0.1]:43255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPVoP-0003rA-2p for submit@debbugs.gnu.org; Thu, 04 Jul 2024 19:24:25 -0400 Received: from layka.disroot.org ([178.21.23.139]:46642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sPVoN-0003r2-JQ for 71944@debbugs.gnu.org; Thu, 04 Jul 2024 19:24:23 -0400 X-Virus-Scanned: SPAM Filter at disroot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1720135449; bh=kdDOfWyZFPm6J/ZLe2KWtpjOhgJcTDA9uNUUfnS7diE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=F5nuE3RZ5KSzvkCCbQZOCtWZE5NAkC4EM0f7b2w70YoqFINOkObssnBPPk9M1bJLI ZTSlvnPREwPcDOQm043M24xzdZQYgQccZuvEvgVsgIY0abCn8+6kZWn/QY+o5xgvK+ igWjO8PuQUTkdTorT1hkapG+wMSHE1Z42z3Sif0NALZnpPMgP1KJG7276yUuxhuF01 5w1mXwcPU8vaasDmKhGPYQHPl7mIBFIE1eQWEpFetp9u84t8Qnow3lZptwSBcc+hJu nFHl59isOKkjHm1qjlE3KNpHiphC/Sw/7Q5oPbzUFgG/u0mW8vlgnt5s2tz9TJE32r BIjcrHNLCwB1g== Date: Thu, 4 Jul 2024 16:23:47 -0700 Message-ID: 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: , Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches X-Patchwork-Original-From: James Smith via Guix-patches via From: James Smith 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.scm (lollypop)[arguments]: Convert to list of G-Expressions. Change-Id: I2f7e0157f65bdd6776fbf15214093a837c5b0fd6 --- gnu/packages/gnome.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a4d1babe3..3b95b20eef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11566,24 +11566,24 @@ (define-public lollypop (base32 "1laj5xwfz2bz29scga2ahhnhlgll4a0n21wwy8mlr4jsl81g0jsa")))) (build-system meson-build-system) (arguments - `(#:imported-modules (,@%meson-build-system-modules - (guix build python-build-system)) - #:modules ((guix build meson-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-gtk-update-icon-cache - (lambda _ - (setenv "DESTDIR" "/"))) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/lollypop") - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH")))))) - (add-after 'install 'wrap-python - (assoc-ref python:%standard-phases 'wrap))))) + (list #:imported-modules `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-gtk-update-icon-cache + (lambda _ + (setenv "DESTDIR" "/"))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/lollypop") + (list "GI_TYPELIB_PATH" ":" 'prefix + (list (getenv "GI_TYPELIB_PATH")))))) + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap))))) (native-inputs (list gettext-minimal `(,glib "bin") ; For glib-compile-resources