From patchwork Tue Feb 27 16:08:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 61170 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 7049427BBE9; Tue, 27 Feb 2024 16:09:54 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 ADD9627BBE2 for ; Tue, 27 Feb 2024 16:09:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rf01S-0007Vj-GL; Tue, 27 Feb 2024 11:09:38 -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 1rf01Q-0007V7-GB for guix-patches@gnu.org; Tue, 27 Feb 2024 11:09:36 -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 1rf01Q-0004FS-7Z for guix-patches@gnu.org; Tue, 27 Feb 2024 11:09:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rf01q-0005ro-6R for guix-patches@gnu.org; Tue, 27 Feb 2024 11:10:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69430] [PATCH 2/2] gnu: sway: Update package style. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Feb 2024 16:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69430 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69430@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 69430-submit@debbugs.gnu.org id=B69430.170905016922467 (code B ref 69430); Tue, 27 Feb 2024 16:10:02 +0000 Received: (at 69430) by debbugs.gnu.org; 27 Feb 2024 16:09:29 +0000 Received: from localhost ([127.0.0.1]:35059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf01I-0005qJ-NU for submit@debbugs.gnu.org; Tue, 27 Feb 2024 11:09:29 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:53404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rf01G-0005q5-Oc for 69430@debbugs.gnu.org; Tue, 27 Feb 2024 11:09:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1709050123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I9yGiZ+rGCs/oO5iqMOy9JJSuPNhEW+b765tMyq/00A=; b=unhLNamsno/u1xIJNs/SAxOwmeeu/cc4VRKnCOcW0va62BKyi1cknNz9laFSPi4vQVaWsZ 7qEHTDUXvlVn3j/CuDZeF+YWxY8AHXJb92C1mQhEd6w6YrpxY4FZCUicVFIPWc9aEsaY+o yJQeVBKeXM0bLYwDuFnoSQQAKh166T8DzJ29VzgoEJ30G/djypAQ1ipaFnYC6+dZd4gQE7 UATKrSAEn38hwMWcEUyVqfwtFJ+344sx+bBCTmF27hoO/+zTRwJT8UVL/sGNFlPGgipIfh AncVmx2AT0tc0lGkWqST1W/egLQRC1fm0xkSAVlgGJ77Y/u73kAYcR4XBA5MNw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Wed, 28 Feb 2024 00:08:45 +0800 Message-ID: <4e0fe40cb9f4e6974520c36026a233fa300501e3.1709049313.git.hako@ultrarare.space> In-Reply-To: <75e2cd50e71e8b3289a8493d1db94dbfbfa1ac63.1709049313.git.hako@ultrarare.space> References: <75e2cd50e71e8b3289a8493d1db94dbfbfa1ac63.1709049313.git.hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: --- 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/wm.scm (sway)[arguments]: Use gexps. <#:phases>: Adjust to use ‘search-input-file’. Remove trailing #t. Change-Id: I5bd91faf2c79566486437b37cf72964d2c6a85fc --- gnu/packages/wm.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 90d61d1d86..e5bc434166 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1769,19 +1769,20 @@ (define-public sway (base32 "1n36vgpi4bg2gkiq4fam4khly1z9bjinmjclzq5vfx0z8h7a5bzz")))) (build-system meson-build-system) (arguments - `(;; elogind is propagated by wlroots -> libseat - ;; and would otherwise shadow basu. - #:configure-flags '("-Dsd-bus-provider=basu") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'hardcode-paths - (lambda* (#:key inputs #:allow-other-keys) - ;; Hardcode path to swaybg. - (substitute* "sway/config.c" - (("strdup..swaybg..") - (string-append "strdup(\"" (assoc-ref inputs "swaybg") - "/bin/swaybg\")"))) - #t))))) + (list + ;; elogind is propagated by wlroots -> libseat + ;; and would otherwise shadow basu. + #:configure-flags + #~'("-Dsd-bus-provider=basu") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'hardcode-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Hardcode path to swaybg. + (substitute* "sway/config.c" + (("strdup..swaybg..") + (format #f "strdup(\"~a\")" + (search-input-file inputs "bin/swaybg"))))))))) (inputs (list basu cairo gdk-pixbuf