From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id YPzRME6ITWMCewAAbAwnHQ (envelope-from ) for ; Mon, 17 Oct 2022 18:52:30 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id ELvlME6ITWPihAEA9RJhRA (envelope-from ) for ; Mon, 17 Oct 2022 18:52:30 +0200 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 8EB4532AAE for ; Mon, 17 Oct 2022 18:52:30 +0200 (CEST) Received: from localhost ([::1]:35600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okTLp-0000S2-Oi for larch@yhetil.org; Mon, 17 Oct 2022 12:52:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okTLO-0000QS-EA for guix-patches@gnu.org; Mon, 17 Oct 2022 12:52:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okTLO-0003aL-6G for guix-patches@gnu.org; Mon, 17 Oct 2022 12:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okTLO-000669-2O for guix-patches@gnu.org; Mon, 17 Oct 2022 12:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58585] [PATCH 1/2] gnu: mako: Patch makoctl to refer directly to binaries. References: <20221017162828.14482-1-paren@disroot.org> In-Reply-To: <20221017162828.14482-1-paren@disroot.org> Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 16:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58585 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58585@debbugs.gnu.org Cc: "\(" Received: via spool by 58585-submit@debbugs.gnu.org id=B58585.166602551223420 (code B ref 58585); Mon, 17 Oct 2022 16:52:02 +0000 Received: (at 58585) by debbugs.gnu.org; 17 Oct 2022 16:51:52 +0000 Received: from localhost ([127.0.0.1]:49785 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okTLE-00065a-2N for submit@debbugs.gnu.org; Mon, 17 Oct 2022 12:51:52 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52508) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okTLB-00065R-WB for 58585@debbugs.gnu.org; Mon, 17 Oct 2022 12:51:50 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 564394DAF5; Mon, 17 Oct 2022 18:51:49 +0200 (CEST) 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 UTF8SMTP id 3laPJ0DBw5hN; Mon, 17 Oct 2022 18:51:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1666025227; bh=oTO0DeyhhChxq1EHkAKDFe6VXwx/dKma0ayueRkxFRI=; h=From:To:Cc:Subject:Date; b=hmmr40wX7aRTwWzWRRr4oQACJ0S6Ql2MeONpsPQOQS7hK9IbPErrVayPksQ1Y5Otn aJsu8QmTA9NiCqqV/g4NioBWZt78w6NWSFJubLKNDck4nAZBaw1MVC38qhNLcRiUYe FqaTTs3cCq6X6EiWro7CWwsfImgLFDtSFRBXG5+GOhKch6h56SSfW2hqqfkLneoll+ Yyht82wzHBgGxc0FVNStYf5WIZbP+yvx9mcD12Hc1COxkcbJuamvQy6+lLtdFCmes4 Q+dulyOEzzhNskxCWjo7DhAm0Ds3HmfBHBnEY9jYhoy0m7zfT31QMy9nXirKU45zaj BYH7UN91gKaDg== Date: Mon, 17 Oct 2022 17:47:02 +0100 Message-Id: <20221017164703.14949-1-paren@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" From: "\( via Guix-patches" via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1666025550; 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-type:content-type: 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=SmFdJy2Q19va+SuGnb5eifaetrJMtO8PinQb/y92Kc0=; b=bv8lpdrTs6bE48vtkg1pDGMgD9zoXJklVZkobWNp97k55wmAb/0avD22Hdl+l81Bi+xlV4 nB5EsnUWwUJ3786DzF5/f8EO/VyKYEzhC0PJsnMwX7aEZ7UHmrqA3PXFZJir5QV/TdCfab RNLv0RtruOGQoh1T8T0QMIkYtU0fLXs5XCsrajDy65F1/Q5WQX/XzBw0Ek/lkhtKigcJUA p2r0NhppKJ+qOv2/Ixr8CsO3mNdAZ3auBkfGE5pq30G1dA5U1RDT8vJnnMTFQ3BkmY8M3U F+fro50Ocqufw+WlUfs5Kh7pAxA9clpsqzIIxRG/gzQuDbly/V/zK07lJgb2dA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1666025550; a=rsa-sha256; cv=none; b=fas7GCsCsaQAN+5hqZ7G46TcVanidFdb4Pwqe2czkjpYIEgHWmiiUQ5MqkOLTS/EKoXzjl VG4ORuEPzD7XPo/xHr0jubh9UEUEuRyrB9W7NPT2VIHULTtMFAULlcdJb18w949DIhybh/ e+5SPFKaKr7x3DnCVYh1E9HNfTqQKHyoktEvg2j82iTcfy8w7YStV3BeDx0XrQGxoPFRKr lkrU9fwyrYOjhDtQV3QejicEbHr4S4wmmP9lb0pk7olvWaHKUJzYwtr6OUltH3/D8XvWKQ ad5fF5M63e9T+XMZAjxFsrUCpxA8uTT6u8mWRHy/qkAt2ZKAgYZSC2f+UsU/sA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=hmmr40wX; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -2.22 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=disroot.org header.s=mail header.b=hmmr40wX; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: 8EB4532AAE X-Spam-Score: -2.22 X-Migadu-Scanner: scn0.migadu.com X-TUID: f2Oa8o+OZPPy * gnu/packages/wm.scm (mako)[arguments]<#:phases>{'patch-makoctl}: New phase. [inputs]: Add jq. --- gnu/packages/wm.scm | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index af406ed2ed..d96846a21c 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -58,6 +58,7 @@ ;;; Copyright © 2022 Elais Player ;;; Copyright © 2022 Trevor Richards ;;; Copyright © 2022 Fredrik Salomonsson +;;; Copyright © 2022 ( ;;; ;;; This file is part of GNU Guix. ;;; @@ -1807,17 +1808,32 @@ (define-public mako (package (name "mako") (version "1.7.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/emersion/mako") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emersion/mako") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0vpar1a7zafkd2plmyaackgba6fyg35s9zzyxmj8j7v2q5zxirgz")))) (build-system meson-build-system) - (inputs (list basu cairo gdk-pixbuf pango wayland)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makoctl + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "makoctl" + (("^BUSCTL=.*$") + (string-append + "BUSCTL=" + (search-input-file inputs "bin/basuctl") + "\n")) + (("jq ") + (string-append + (search-input-file inputs "bin/jq") + " ")))))))) + (inputs (list basu cairo gdk-pixbuf jq pango wayland)) (native-inputs (list pkg-config scdoc wayland-protocols)) (home-page "https://wayland.emersion.fr/mako") (synopsis "Lightweight Wayland notification daemon") -- 2.38.0