From patchwork Thu Jun 23 14:40:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 40269 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 78AF027BBEA; Thu, 23 Jun 2022 15:41:13 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,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 A843027BBE9 for ; Thu, 23 Jun 2022 15:41:12 +0100 (BST) Received: from localhost ([::1]:50854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4O19-00062C-RE for patchwork@mira.cbaines.net; Thu, 23 Jun 2022 10:41:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4O10-00061p-HJ for guix-patches@gnu.org; Thu, 23 Jun 2022 10:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4O10-0001be-8b for guix-patches@gnu.org; Thu, 23 Jun 2022 10:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4O10-0000yf-6C for guix-patches@gnu.org; Thu, 23 Jun 2022 10:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56127] [PATCH 1/2 v2] gnu: polybar: Update to 3.6.3. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 23 Jun 2022 14:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56127 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 56127@debbugs.gnu.org Received: via spool by 56127-submit@debbugs.gnu.org id=B56127.16559952533734 (code B ref 56127); Thu, 23 Jun 2022 14:41:02 +0000 Received: (at 56127) by debbugs.gnu.org; 23 Jun 2022 14:40:53 +0000 Received: from localhost ([127.0.0.1]:39539 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4O0r-0000yA-JD for submit@debbugs.gnu.org; Thu, 23 Jun 2022 10:40:53 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:61370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4O0p-0000xr-Sg for 56127@debbugs.gnu.org; Thu, 23 Jun 2022 10:40:52 -0400 Date: Thu, 23 Jun 2022 14:40:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1655995245; x=1656254445; bh=TcKNp7eNMM2m15EwQOfD/JKfm24f2AG+A25FrqxoVXY=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=g2sZ4vfapU7IqXIvdluzWrH+u1G7wVIDfYz39ydAWUA1lIv7dCKhyuno43MSwPzGp L4zoeae23gpwD8/Ns+TsAlPxUYB4qJ64G9sWGW/+FTGUUnie+x4XccbFvTLvD2Que+ Jv6YPnJBLB2Xu2wK76wiflgFRdjjQfKfHbfnqGWQL/j2v5396sAEHdubl+8u0raWT1 P52xjflqyYPs0tcl8KI8QpnJoA6016PK+r3b3/2qLm8wMe2axyJtqytt0pLYCBbgQH EbO5dlfEFVFJxSPbZ31Ckh3oAFCIend8AEic/U4iCA1nZOhwjqSLN5UYx0CZEsSf+r X8lBQOINiChNA== Message-ID: In-Reply-To: <875ykru1ll.fsf@jpoiret.xyz> References: <878rpou84l.fsf@jpoiret.xyz> <875ykru1ll.fsf@jpoiret.xyz> Feedback-ID: 7805494:user:proton 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: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hi Josselin, ------- Original Message ------- On Thursday, June 23rd, 2022 at 6:16 AM, Josselin Poiret wrote: > > Yes, I meant running from store or using `guix shell polybar -- polybar` > (which does not setup XDG_CONFIG_DIRS). > Done in the update first patch, checked that now `guix shell polybar -- polybar` finds the default config. > > And yes, can update with a second commit to clean native-inputs as well. > Added this second little patch. Thanks! John From addc99adfc0013da57dcda43df96fca11eb33d1c Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 21 Jun 2022 14:14:08 -0400 Subject: [PATCH 1/2] gnu: polybar: Update to 3.6.3. * gnu/packages/wm.scm (polybar): Update to 3.6.3. [phases]: Add patch-config-path for polybar to find its default configuration file in the store. [inputs]: Add libuv, required to build polybar. [native-inputs]: Remove python-2, no longer needed. --- gnu/packages/wm.scm | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index d816bad871..92106045e9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1469,19 +1469,29 @@ (define-public nitrogen (define-public polybar (package (name "polybar") - (version "3.5.7") + (version "3.6.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/polybar/polybar/releases/" "download/" version "/polybar-" version ".tar.gz")) (sha256 - (base32 "1nr386jdlm8qkbdf23w7lyvbfhr362s90f957fawnyi1finhw8bk")))) + (base32 "19azx5dpfyfh0pv4q2fcrf4p7a0pc5d13m7lnv3qy8376mbmhmzj")))) (build-system cmake-build-system) (arguments ;; Test is disabled because it requires downloading googletest from the ;; Internet. - '(#:tests? #f)) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Make polybar find its default configuration file in the + ;; store. + (add-after 'unpack 'patch-config-path + (lambda _ + (substitute* "CMakeLists.txt" + (("/etc") (string-append #$output "/etc"))) + (substitute* "src/utils/file.cpp" + (("\"/etc\"") (string-append "\"" #$output "/etc\"")))))))) (inputs (list alsa-lib cairo @@ -1489,6 +1499,7 @@ (define-public polybar jsoncpp libmpdclient libnl + libuv libxcb pulseaudio xcb-proto @@ -1500,9 +1511,6 @@ (define-public polybar (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) ; for the manual - ;; XXX: "python" input must be located after "python-2", or the package - ;; fails to build with "missing required python module: xcbgen". - ("python-2" ,python-2) ; lib/xpp depends on python 2 ("python" ,python))) ; xcb-proto depends on python 3 (home-page "https://polybar.github.io/") (synopsis "Fast and easy-to-use status bar") -- 2.36.1