From 8d704b095ec311d1b01d0f02cfd7753ea6368a10 Mon Sep 17 00:00:00 2001
From: Peter Sanford <psanford@sanford.io>
Date: Sat, 15 Jun 2024 11:56:26 -0700
Subject: [PATCH] rivercarro: 0.3.0 -> 0.4.0

---
 pkgs/applications/misc/rivercarro/default.nix | 15 ++++++++++-----
 pkgs/applications/misc/rivercarro/deps.nix    | 13 +++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/misc/rivercarro/deps.nix

diff --git a/pkgs/applications/misc/rivercarro/default.nix b/pkgs/applications/misc/rivercarro/default.nix
index fa99e88f87a6..9c951a6433ce 100644
--- a/pkgs/applications/misc/rivercarro/default.nix
+++ b/pkgs/applications/misc/rivercarro/default.nix
@@ -1,23 +1,24 @@
 { lib
 , stdenv
+, callPackage
 , fetchFromSourcehut
 , pkg-config
 , river
 , wayland
 , wayland-protocols
-, zig_0_11
+, zig_0_12
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rivercarro";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromSourcehut {
     owner = "~novakane";
     repo = "rivercarro";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-lucwn9MmyVd4pynuG/ZAXnZ384wdS0gi7JN44vNQA1I=";
+    hash = "sha256-nDKPv/roweW7ynEROsipUJPvs6VMmz3E4JzEFRBzE6s=";
   };
 
   nativeBuildInputs = [
@@ -25,9 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
     river
     wayland
     wayland-protocols
-    zig_0_11.hook
+    zig_0_12.hook
   ];
 
+  postPatch = ''
+    ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+  '';
+
   meta = with lib; {
     homepage = "https://git.sr.ht/~novakane/rivercarro";
     description = "Layout generator for river Wayland compositor, fork of rivertile";
@@ -44,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ kraem ];
-    inherit (zig_0_11.meta) platforms;
+    inherit (zig_0_12.meta) platforms;
     mainProgram = "rivercarro";
   };
 })
diff --git a/pkgs/applications/misc/rivercarro/deps.nix b/pkgs/applications/misc/rivercarro/deps.nix
new file mode 100644
index 000000000000..682e0e75542a
--- /dev/null
+++ b/pkgs/applications/misc/rivercarro/deps.nix
@@ -0,0 +1,13 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{ linkFarm, fetchzip }:
+
+linkFarm "zig-packages" [
+  {
+    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
+      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
+    };
+  }
+]