From patchwork Tue Mar 7 03:44:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SeerLite X-Patchwork-Id: 10763 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 46BAC16DB0; Tue, 7 Mar 2023 03:46:17 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 AB25916DBC for ; Tue, 7 Mar 2023 03:46:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZOH5-0000G0-VG; Mon, 06 Mar 2023 22:46:03 -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 1pZOH4-0000Fc-UP for guix-patches@gnu.org; Mon, 06 Mar 2023 22:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZOH4-0005Tp-Le for guix-patches@gnu.org; Mon, 06 Mar 2023 22:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZOH4-0002EB-HX for guix-patches@gnu.org; Mon, 06 Mar 2023 22:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61975] [PATCH v2 1/2] gnu: i3-wm: Use new package style. References: <20230305062848.13101-1-seerlite@disroot.org> In-Reply-To: <20230305062848.13101-1-seerlite@disroot.org> Resent-From: SeerLite Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 07 Mar 2023 03:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61975 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61975@debbugs.gnu.org Cc: SeerLite Received: via spool by 61975-submit@debbugs.gnu.org id=B61975.16781607288508 (code B ref 61975); Tue, 07 Mar 2023 03:46:02 +0000 Received: (at 61975) by debbugs.gnu.org; 7 Mar 2023 03:45:28 +0000 Received: from localhost ([127.0.0.1]:44171 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZOGW-0002D9-Ay for submit@debbugs.gnu.org; Mon, 06 Mar 2023 22:45:28 -0500 Received: from knopi.disroot.org ([178.21.23.139]:50394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZOGU-0002Cy-CJ for 61975@debbugs.gnu.org; Mon, 06 Mar 2023 22:45:27 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id D770F4449A; Tue, 7 Mar 2023 04:45:24 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H4sCD1vaJZTb; Tue, 7 Mar 2023 04:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678160723; bh=F3f7g5AgdByUdFv3fWqS4exT75AWRR6bLPNGIcnr0BU=; h=From:To:Cc:Subject:Date; b=GeDt7wSs0eBLbYPTRqq4/94bN2g9hHo/ZwegJ5XeW4bKM5hg9ZJUggC4+co0yxrEw o+p3aU+00xJH3I6WMDaALE18/p6SR2+AhR3ztu4k5eRXYVJQh+63Bcppm87p7cfn8K 3puqFqr3qpGMUtd2rYL89zwl8SqcXgeI1gZMQXN2DG4SlmAlTgELOKKJ1mwSZd6oX5 gtxVKYWMw2Kmob287h1QXz0XhRGfemukgLj+J73AJfMb4UDlBjy9381nOice2SiuVe /OoISbNyRCqugQqbvvSbOEkWTp/cAlzNGCUVcXX3S7SLtJgZfBmgTjBAudeNCkqNuU L373IVCSfUhYA== Date: Tue, 7 Mar 2023 00:44:57 -0300 Message-Id: <20230307034458.21736-1-seerlite@disroot.org> 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: SeerLite X-ACL-Warn: , SeerLite via Guix-patches X-Patchwork-Original-From: SeerLite via Guix-patches via From: SeerLite 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 (i3-wm)[arguments]: Use gexps. --- gnu/packages/wm.scm | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 5b8dbd5c70..3bdbc43c51 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -325,20 +325,19 @@ (define-public i3-wm "0jrya4rhh46sivlmqaqc4n9abpp1yn1ajhi616gn75cxwl8rjqr8")))) (build-system meson-build-system) (arguments - `(;; The test suite requires the unpackaged Xephyr X server. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'install 'patch-session-file - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (i3 (string-append out "/bin/i3")) - (i3-with-shmlog (string-append out "/bin/i3-with-shmlog"))) - (substitute* (string-append out "/share/xsessions/i3.desktop") - (("Exec=i3") (string-append "Exec=" i3))) - (substitute* (string-append out "/share/xsessions/i3-with-shmlog.desktop") - (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog))) - #t)))))) + (list + ;; The test suite requires the unpackaged Xephyr X server. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'patch-session-file + (lambda _ + (let* ((i3 (string-append #$output "/bin/i3")) + (i3-with-shmlog (string-append #$output "/bin/i3-with-shmlog"))) + (substitute* (string-append #$output "/share/xsessions/i3.desktop") + (("Exec=i3") (string-append "Exec=" i3))) + (substitute* (string-append #$output "/share/xsessions/i3-with-shmlog.desktop") + (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog))))))))) (inputs (list libxcb xcb-util