From 479b7f296cdde816916065021690071a0ce8ce8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=96R=C3=96SK=C5=90I=20Andr=C3=A1s?= <voroskoi@gmail.com>
Date: Sun, 26 Oct 2025 15:53:43 +0100
Subject: [PATCH] gnu: river: Update to 0.3.12.

* gnu/packages/zig-xyz.scm (river): Update to 0.3.12.
[arguments]<#:zig>: New parameter.
<#:phases>{prepare-build.zig.zon, revert-build.zig.zon}: New phases.

Change-Id: I9a8fd0d71d07a5c89ba874791c4a021be0725e94
Signed-off-by: Andreas Enge <andreas@enge.fr>
---
 gnu/packages/zig-xyz.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm
index 416355db3a547b66a8ce2ed2f5db308d1a8702a4..5f9bd67aa04f9e39e98a5a69cf6833650b42df4e 100644
--- a/gnu/packages/zig-xyz.scm
+++ b/gnu/packages/zig-xyz.scm
@@ -130,7 +130,7 @@ performance of multiple commands with a colorful terminal user interface.")
 (define-public river
   (package
     (name "river")
-    (version "0.3.6")
+    (version "0.3.12")
     (source
      (origin
        (method git-fetch)
@@ -139,10 +139,11 @@ performance of multiple commands with a colorful terminal user interface.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1g4p1fa9kf23ldq1p8yplkb7hnkhfynhn93z6qqm67nacss2idbc"))))
+        (base32 "1jh374v6c0mfrppj0fgz177qxi3ihcisq158ismqnhagnbdk3z2w"))))
     (build-system zig-build-system)
     (arguments
-     (list #:install-source? #f
+     (list #:zig zig-0.15
+           #:install-source? #f
            #:zig-release-type "safe"
            #:zig-build-flags
            #~(list "-Dpie" "-Dxwayland")
@@ -152,6 +153,20 @@ performance of multiple commands with a colorful terminal user interface.")
                  (lambda _
                    (substitute* "build.zig"
                      (("/bin/sh") (which "sh")))))
+               (add-after 'unpack 'prepare-build.zig.zon
+                 (lambda _
+                   (substitute* "build.zig.zon"
+                     (("\\.pixman") ".@\"zig-pixman\"")
+                     (("\\.wayland") ".@\"zig-wayland\"")
+                     (("\\.wlroots") ".@\"zig-wlroots\"")
+                     (("\\.xkbcommon") ".@\"zig-xkbcommon\""))))
+               (add-before 'build 'revert-build.zig.zon
+                 (lambda _
+                   (substitute* "build.zig.zon"
+                     (("\\.@\"zig-pixman\"") ".pixman")
+                     (("\\.@\"zig-wayland\"") ".wayland")
+                     (("\\.@\"zig-wlroots\"") ".wlroots")
+                     (("\\.@\"zig-xkbcommon\"") ".xkbcommon"))))
                (add-after 'install 'install-wayland-session
                  (lambda _
                    (let ((wayland-sessions