From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id OKgUAYezBmTdBQEASxT56A (envelope-from ) for ; Tue, 07 Mar 2023 04:46:15 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 0F0/AYezBmT36gAAauVa8A (envelope-from ) for ; Tue, 07 Mar 2023 04:46:15 +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 006E3B602 for ; Tue, 7 Mar 2023 04:46:13 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=MQktweJZ; 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678160774; 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=2ZftfHMheX5WnYsyjCaS2YQ7NuA8qaSRVFL11xbEWMs=; b=od1v6bdgwYJPXajS/MddW0MOxlynRmFAWRTbk66uDup4r9OQ59ol+HqCT7Zjro0/HSUNBC uP2deoOlpCTbX7/hU5QVjGbt0wSDfPktt6c8S9aYmnbY+FXLHqHIC0Rm6Fkcp5ut21QTpt xKuU3nPq9UpFyuOvvkNb1hBpurMKLhQ+hzpV7PBli3sPpcgYayXrSZR3dGPXN1IflbQa6y +GT9VeqLbTLRorkheXZpKHa3FdMdhWHilaQpd67QR6JLyBKgCOlR+0wOSlKFH7FacCyIjt M1QGqOu72Nq4bUDCkRpESVacvQH9C6d8uVASJUlkYbUUuN7gl9ij6bg2LvnWIA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678160774; a=rsa-sha256; cv=none; b=OCmp5+vNPnSqcAQBDvgMSJ4pUw7sebcbFSeMpW7V2ChUJhfZtDYArgVetxeQMZ6kv0ifSc qOpMj1MyeU5HiopuDaKh15bW1HrDEU99q6jSKP8e2KMnfZxCqSM4B/nnVrHhqHIbHs0peM FV6ERgYzzenjhsxIlRO5PCxDGHZLImV6yvckl5pYG9dUum/xDyS203kSR4n3U561Y3/II3 fmaDEu5KX73mmcuLs3SyiyTEO76nSOrde7BalF0RVrQDxSFvCeOaDu+7feydnnjON+mHJe iIthsoG5e5ggeVaLFar8uiXq2/bkHOBUqTPeddFIT4MMeXQ6q0IpL+tWeRyRIA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=MQktweJZ; 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZOH6-0000G3-Ue; Mon, 06 Mar 2023 22:46:04 -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 1pZOH5-0000Fo-Dy 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 1pZOH5-0005Tw-5C for guix-patches@gnu.org; Mon, 06 Mar 2023 22:46:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZOH4-0002EP-Ut for guix-patches@gnu.org; Mon, 06 Mar 2023 22:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61975] [PATCH v2 2/2] gnu: i3-wm: Add missing inputs for i3-save-tree. 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.16781607538547 (code B ref 61975); Tue, 07 Mar 2023 03:46:02 +0000 Received: (at 61975) by debbugs.gnu.org; 7 Mar 2023 03:45:53 +0000 Received: from localhost ([127.0.0.1]:44175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZOGu-0002Dl-NZ for submit@debbugs.gnu.org; Mon, 06 Mar 2023 22:45:53 -0500 Received: from knopi.disroot.org ([178.21.23.139]:51932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZOGt-0002De-Ds for 61975@debbugs.gnu.org; Mon, 06 Mar 2023 22:45:51 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C05D341441; Tue, 7 Mar 2023 04:45:50 +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 gtW0olUhPU4O; Tue, 7 Mar 2023 04:45:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1678160749; bh=QbcbyIsY0WeJlwmDA0qSJ4gn4EdhkErZDhsQ/bMGGHY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MQktweJZhr1x3C3Vr33wu84Yfuxhb0y1gJRW1fywiCPVjXxvpiPWbKR3PnqtG8BRw lrIXP386wpk+XuNRoLs4Yym6JMVL8E9LiNJQTtzeCCMWkK8czXED9dBPhPGPWTngO8 +1HN5xADFxBztX4MsuSQq4vjhMLU/PJGDOGJ8t6emIbHAWmIezHo+DQ/BAR/xUxCqz fPsxrm3bKHWhwnyWKdQOt2Dvgvp9rifzwv1A2H0wEtiHj0XkIQSriKT4KLylBTmIvv K2Oyi326eZ0BvOgJ37HhstmyttLEKApY6dVjVTdql3Hnxci2JsAZXiUMSQ+HB5Oko/ 7lNKTYk3zD9jQ== Date: Tue, 7 Mar 2023 00:44:58 -0300 Message-Id: <20230307034458.21736-2-seerlite@disroot.org> In-Reply-To: <20230307034458.21736-1-seerlite@disroot.org> References: <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-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: 006E3B602 X-Spam-Score: -2.81 X-Migadu-Spam-Score: -2.81 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-Flow: FLOW_IN X-Migadu-Country: US X-TUID: wqxXa3BrttOw * gnu/packages/wm.scm (i3-wm)[inputs]: Add perl, perl-anyevent-i3, perl-json-xs, perl-common-sense, and perl-types-serialiser. [arguments]: Add phase to wrap i3-save-tree to use perl inputs listed above. --- gnu/packages/wm.scm | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 3bdbc43c51..fe9a7b959d 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -332,12 +332,26 @@ (define-public i3-wm #~(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"))) + (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))))))))) + (("Exec=i3-with-shmlog") (string-append "Exec=" i3-with-shmlog)))))) + (add-after 'patch-session-file 'wrap-perl-bin + (lambda* (#:key inputs #:allow-other-keys) + (let* ((i3-save-tree (string-append #$output "/bin/i3-save-tree")) + (perl-lib-names '("perl-anyevent" + "perl-anyevent-i3" + "perl-json-xs" + "perl-common-sense" + "perl-types-serialiser")) + (perl-lib-paths + (map (lambda (name) + (string-append (assoc-ref inputs name) "/lib/perl5/site_perl")) + perl-lib-names))) + (wrap-program i3-save-tree + `("PERL5LIB" ":" prefix ,perl-lib-paths)))))))) (inputs (list libxcb xcb-util @@ -349,6 +363,11 @@ (define-public i3-wm libev yajl xmlto + perl + perl-anyevent-i3 + perl-json-xs + perl-common-sense + perl-types-serialiser perl-pod-simple libx11 pcre2 -- 2.39.1