unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: stuebinm via Guix-patches via <guix-patches@gnu.org>
To: 69482@debbugs.gnu.org
Cc: stuebinm <stuebinm@disroot.org>
Subject: [bug#69482] [PATCH] gnu: hikari: fix build.
Date: Thu, 29 Feb 2024 23:40:34 +0100	[thread overview]
Message-ID: <ba2edf5ac31fc00b13d961ef220754dc4bbdee35.1709246434.git.stuebinm@disroot.org> (raw)

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





             reply	other threads:[~2024-03-01  2:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-29 22:40 stuebinm via Guix-patches via [this message]
2024-03-19 16:14 ` bug#69482: [PATCH] gnu: hikari: fix build Ludovic Courtès
2024-03-21 10:26   ` [bug#69482] " terru 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

  List information: https://guix.gnu.org/

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

  git send-email \
    --in-reply-to=ba2edf5ac31fc00b13d961ef220754dc4bbdee35.1709246434.git.stuebinm@disroot.org \
    --to=guix-patches@gnu.org \
    --cc=69482@debbugs.gnu.org \
    --cc=stuebinm@disroot.org \
    /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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).