From patchwork Sun Jan 29 11:15:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Matthiesen X-Patchwork-Id: 46510 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 0B66427BBEE; Sun, 29 Jan 2023 11:18: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=-3.9 required=5.0 tests=BAYES_00,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 D2D4027BBEB for ; Sun, 29 Jan 2023 11:18:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pM5hE-0006tV-4c; Sun, 29 Jan 2023 06:18: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 1pM5hC-0006t4-Cb for guix-patches@gnu.org; Sun, 29 Jan 2023 06:18:02 -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 1pM5hC-00065V-4m for guix-patches@gnu.org; Sun, 29 Jan 2023 06:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pM5hB-0006MU-WD for guix-patches@gnu.org; Sun, 29 Jan 2023 06:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61145] [PATCH] Added libcap to the native inputs of mako. Resent-From: Samuel Fadel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Jan 2023 11:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61145@debbugs.gnu.org Cc: Samuel Fadel X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167499107524437 (code B ref -1); Sun, 29 Jan 2023 11:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Jan 2023 11:17:55 +0000 Received: from localhost ([127.0.0.1]:42348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM5h5-0006M5-2W for submit@debbugs.gnu.org; Sun, 29 Jan 2023 06:17:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:59414) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pM5h2-0006Lw-W9 for submit@debbugs.gnu.org; Sun, 29 Jan 2023 06:17:54 -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 1pM5h1-0006p2-Ta for guix-patches@gnu.org; Sun, 29 Jan 2023 06:17:52 -0500 Received: from mout-p-202.mailbox.org ([2001:67c:2050:0:465::202]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pM5gz-00063W-Ti for guix-patches@gnu.org; Sun, 29 Jan 2023 06:17:51 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4P4TLY2rY3z9sTL; Sun, 29 Jan 2023 12:17:41 +0100 (CET) From: Samuel Fadel Date: Sun, 29 Jan 2023 12:15:22 +0100 Message-Id: <20230129111521.24921-1-samuel@nihil.ws> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4P4TLY2rY3z9sTL Received-SPF: none client-ip=2001:67c:2050:0:465::202; envelope-from=samuel@nihil.ws; helo=mout-p-202.mailbox.org X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Guix, I have prepared this patch to fix the build of mako 1.7.1. Here is the failed build log: http://ci.guix.gnu.org/build/370206/details I'm not sure if this is the correct way to address this issue, but in my local tests it fixes the build. Samuel *** This allows pkg-config to detect libcap during the build of mako. This is used by meson to generate cargs for basu (a dependency of mako), which in turn needs libcap. * gnu/packages/wm.scm (mako)[native-inputs]: Added libcap --- gnu/packages/wm.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 2fd70af07f..f17bc0af3f 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1858,7 +1858,7 @@ (define-public mako (search-input-file inputs "bin/jq") " ")))))))) (inputs (list basu cairo gdk-pixbuf jq pango wayland)) - (native-inputs (list pkg-config scdoc wayland-protocols)) + (native-inputs (list libcap pkg-config scdoc wayland-protocols)) (home-page "https://wayland.emersion.fr/mako") (synopsis "Lightweight Wayland notification daemon") (description "Mako is a lightweight notification daemon for Wayland