all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: John Kehayias via Guix-patches via <guix-patches@gnu.org>
To: Josselin Poiret <dev@jpoiret.xyz>
Cc: 56127@debbugs.gnu.org
Subject: [bug#56127] [PATCH 1/2 v2] gnu: polybar: Update to 3.6.3.
Date: Thu, 23 Jun 2022 14:40:34 +0000	[thread overview]
Message-ID: <YimIaofu1SebPYrFzrj--vfl-d2xOspIL7Z_5OQelsMzDTi53oEGfLcdFg6iWTmP0h5kmyYgvXhDvfeZNjy-Ry6VTHNsAUjxPrk49-csJ2g=@protonmail.com> (raw)
In-Reply-To: <875ykru1ll.fsf@jpoiret.xyz>

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-polybar-Update-to-3.6.3.patch --]
[-- Type: text/x-patch; name=0001-gnu-polybar-Update-to-3.6.3.patch, Size: 2739 bytes --]

From addc99adfc0013da57dcda43df96fca11eb33d1c Mon Sep 17 00:00:00 2001
From: John Kehayias <john.kehayias@protonmail.com>
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


  reply	other threads:[~2022-06-23 14:41 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-21 18:21 [bug#56127] [PATCH] gnu: polybar: Update to 3.6.3 John Kehayias via Guix-patches via
2022-06-22 13:42 ` Josselin Poiret via Guix-patches via
2022-06-22 14:35   ` John Kehayias via Guix-patches via
2022-06-23 10:16     ` Josselin Poiret via Guix-patches via
2022-06-23 14:40       ` John Kehayias via Guix-patches via [this message]
2022-06-23 20:29         ` bug#56127: " Ludovic Courtès
2022-06-23 14:41 ` [bug#56127] [PATCH 2/2] gnu: polybar: Simplify inputs John Kehayias via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='YimIaofu1SebPYrFzrj--vfl-d2xOspIL7Z_5OQelsMzDTi53oEGfLcdFg6iWTmP0h5kmyYgvXhDvfeZNjy-Ry6VTHNsAUjxPrk49-csJ2g=@protonmail.com' \
    --to=guix-patches@gnu.org \
    --cc=56127@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=john.kehayias@protonmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.