From patchwork Mon Oct 17 16:47:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 43466 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 1707227BBEA; Mon, 17 Oct 2022 17:52:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 C9BB327BBE9 for ; Mon, 17 Oct 2022 17:52:36 +0100 (BST) Received: from localhost ([::1]:35600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okTLv-0000S2-UP for patchwork@mira.cbaines.net; Mon, 17 Oct 2022 12:52:35 -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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" X-getmail-retrieved-from-mailbox: Patches * 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")