GNU bug report logs - #69482
[PATCH] gnu: hikari: fix build.

Previous Next

Package: guix-patches;

Reported by: stuebinm <stuebinm <at> disroot.org>

Date: Fri, 1 Mar 2024 00:17:02 UTC

Severity: normal

Tags: patch

Done: Ludovic Courtès <ludo <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: stuebinm <stuebinm <at> disroot.org>
To: 69482 <at> debbugs.gnu.org
Cc: stuebinm <stuebinm <at> disroot.org>
Subject: [bug#69482] [PATCH] gnu: hikari: fix build.
Date: Thu, 29 Feb 2024 23:40:34 +0100
It fails to build with versions of wlroots newer than 0.15, which
seems unlikey to be fixed https://hub.darcs.net/raichoo/hikari/issue/45

* gnu/packages/wm.scm (wlroots-0.15): New variable.
* gnu/packages/wm.scm (hikari)[inputs]: Replace wlroots with wlroots-0.15.

Change-Id: Id90e1e1ff399afe54fff68167f497f0484d2c218
---

Hi everyone! I'm new to Guix, so I hope I'm doing this right. Unfortunately,
hikari seems to be unmaintained for now (see the linked issue, now almost
two years old; asking on their Matrix chat also led to no result).

With this change, hikari builds again, though I could also understand if
it's preferred to remove it entirely over keeping old versions of wlroots
around.

 gnu/packages/wm.scm | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 768fbc5bc7..afa60bf3ad 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1757,6 +1757,21 @@ (define-public wlroots-0.16
     (propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
                          (delete libdisplay-info)))))
 
+(define-public wlroots-0.15
+  (package
+    (inherit wlroots)
+    (name "wlroots-0.15")
+    (version "0.15.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
+             (commit version)))
+       (file-name (git-file-name "wlroots" version))
+       (sha256
+        (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))))
+
 (define-public sway
   (package
     (name "sway")
@@ -3221,7 +3236,7 @@ (define-public hikari
            linux-pam
            pango
            wayland
-           wlroots-0.16))
+           wlroots-0.15))
     (arguments
      `(#:tests? #f                      ; no tests
        #:make-flags

base-commit: b988248e1c88bde3001b7f2b1830dececa7e8b23
-- 
2.42.0





This bug report was last modified 1 year and 63 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.