67/73: gnu: river: Update to 0.3.5.

[guix-commits]

hako pushed a commit to branch wip-zig-bootstrap
in repository guix.

commit 80d8e99364d91c668a1a88365435424e15c3c203
Author: Hilton Chain <hako@ultrarare.space>
AuthorDate: Wed Nov 20 08:36:32 2024 +0800

    gnu: river: Update to 0.3.5.
    
    * gnu/packages/zig-xyz.scm (river): Update to 0.3.5.
    [arguments]<#:zig>: Remove argument.
    <#:zig-inputs>: Add zig-pixman, zig-wayland, zig-wlroots and zig-xkbcommon.
    <#:phases>: Fix /bin/sh path in build.zig.
    [native-inputs]: Move libevdev, libxkbcommon, pixman, wayland,
    wayland-protocols, wlroots-0.16 to...
    [inputs]: ...here.
    Replace wlroots-0.16 with wlroots.
    
    Change-Id: Ibdda51236a855380534b88aff61c17d2e6235f28
---
 gnu/packages/zig-xyz.scm | 66 +++++++++++++++++++++++++++---------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 8a6b24106d..03f08eb5fc 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -39,43 +39,51 @@
 (define-public river
   (package
     (name "river")
-    (version "0.2.4")
+    (version "0.3.5")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/riverwm/river";)
-             (commit (string-append "v" version))
-             (recursive? #t)))
+             (url "https://codeberg.org/river/river";)
+             (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1nvhqs6wwisf8ama7y1y3q3nf2jm9sh5bn46z8kyds8cikm0x1vh"))))
+        (base32 "023c3kqqmnd1vs5q7p1xgspkqzc59v61rpp615c06lpswi0a6him"))))
     (build-system zig-build-system)
     (arguments
-     (list
-      #:zig zig-0.10
-      #:install-source? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'install 'install-wayland-session
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let* ((out (assoc-ref outputs "out"))
-                     (wayland-sessions
-                      (string-append out "/share/wayland-sessions")))
-                (mkdir-p wayland-sessions)
-                (install-file "contrib/river.desktop"
-                              wayland-sessions)))))
-      #:zig-build-flags #~(list "-Dxwayland") ;experimental xwayland support
-      #:zig-release-type "safe"))
-    (native-inputs (list libevdev
-                         libxkbcommon
-                         pkg-config
-                         pixman
-                         scdoc
-                         wayland
-                         wayland-protocols
-                         wlroots-0.16))
-    (home-page "https://github.com/riverwm/river";)
+     (list #:install-source? #f
+           #:zig-release-type "safe"
+           #:zig-build-flags
+           #~(list "-Dxwayland")
+           #:zig-inputs
+           `(("zig-pixman" ,zig-pixman)
+             ("zig-wayland" ,zig-wayland)
+             ("zig-wlroots" ,zig-wlroots)
+             ("zig-xkbcommon" ,zig-xkbcommon))
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'fix-path
+                 (lambda _
+                   (substitute* "build.zig"
+                     (("/bin/sh") (which "sh")))))
+               (add-after 'install 'install-wayland-session
+                 (lambda _
+                   (let ((wayland-sessions
+                          (string-append #$output "/share/wayland-sessions")))
+                     (mkdir-p wayland-sessions)
+                     (install-file "contrib/river.desktop"
+                                   wayland-sessions)))))))
+    (inputs
+     (list libevdev
+           libxkbcommon
+           pixman
+           wayland
+           wayland-protocols
+           wlroots))
+    (native-inputs
+     (list pkg-config
+           scdoc))
+    (home-page "https://isaacfreund.com/software/river/";)
     (synopsis "Dynamic tiling Wayland compositor")
     (description
      "River is a dynamic tiling Wayland compositor with flexible