From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eDRHB4izBmSOGgAASxT56A (envelope-from ) for ; Tue, 07 Mar 2023 04:46:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id eBE4B4izBmSkPwEA9RJhRA (envelope-from ) for ; Tue, 07 Mar 2023 04:46:16 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BED8623174 for ; Tue, 7 Mar 2023 04:46:15 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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 From: SeerLite via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678160775; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=pxIceSJVmMY735VwDaUeM+DXlcvQNtXxScXT+Clc7CM=; b=QhaqycjGr/dG0gnZVgHXXQoks8PK2KEJv0A2qd3Ahn2a55xPJp3wbNDlT8m9YonJAcEhWM U7AOvqcpvD2IfaTjDtSeTMUTd7xhcpEdwaV0ugTlXOzMZ9iAvyYM7uO8aunkohkgxVP8Dd LWaHOJvgXI6t+UemSmUrNK5P+wnBGrVf/6Km+RZ3EO1b1fuWiOOMBflbMWKSkIA41b4y30 E/ltpb7ZPulPysLEoAA46W8J8Hv9l9np0+tWW3NBqqbV8X4j1JJs3SUlVqKu9vo8RUaT1F aqOtJCc5meuhC0vBZZzZy7cBvYPBQkVa1ZO217ZPVWEf87ZIdlVfWCAqGT1lTA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=GeDt7wSs; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678160775; a=rsa-sha256; cv=none; b=j6Ijk+npZqnpHYcwjj5NJSUqT0Uppq5j//oZyzrkllERZRFUti5Zj4mzLrI6JLZHKpp9q5 PJ1cnvKsnruXfPWXwAfuWh7jFpbLnuEfCByx0lwb7mr7q7EaxljwmtT6V6z0daq2xxjY/L uPsOqCzISQ0iPLaYbJUqf3Up/lt3Vt9LS9xQsRxyixaP02Ci0ErIMLn+RSvR+iF3DNIvDt TDn9Uko3oA4N8FxNlJpqruDsFhEdSdp8K0h198RXwf+hZ9jEy34KCthgZu/3PkyuY+zX6V 7oqTsvohBtKuryttLhrJMWuEnScS6tTWVUBZSPwopSu/gNB73yBv+BiA66ovsA== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=GeDt7wSs; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-Migadu-Spam-Score: -1.71 X-Spam-Score: -1.71 X-Migadu-Queue-Id: BED8623174 X-Migadu-Scanner: scn1.migadu.com X-TUID: es4ZFIsvTHFU * 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 -- 2.39.1