From 48d1d09dd413f17dc210c06fe811d509a0bccd9b Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Mon, 30 Dec 2024 09:01:42 +0800
Subject: [PATCH 1/4] hyprwayland-scanner: 0.4.2 -> 0.4.4

Diff: https://github.com/hyprwm/hyprwayland-scanner/compare/v0.4.2...v0.4.4

Changelog: https://github.com/hyprwm/hyprwayland-scanner/releases/tag/0.4.4
---
 pkgs/by-name/hy/hyprwayland-scanner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
index 35650330b655..ff72717819f7 100644
--- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix
+++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprwayland-scanner";
-  version = "0.4.2";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprwayland-scanner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=";
+    hash = "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=";
   };
 
   nativeBuildInputs = [

From 4636dfc678eaa89f8ff7bf32d20aff0cde26928f Mon Sep 17 00:00:00 2001
From: Lin Xianyi <iynaix@gmail.com>
Date: Mon, 30 Dec 2024 09:01:06 +0800
Subject: [PATCH 2/4] hyprlock: 0.6.0 -> 0.6.1

Diff: https://github.com/hyprwm/hyprlock/compare/v0.6.0...v0.6.1
Changelog: https://github.com/hyprwm/hyprlock/releases/tag/v0.6.1
---
 pkgs/by-name/hy/hyprlock/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index f48c8c85deae..d55803b46007 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -9,6 +9,7 @@
   hyprgraphics,
   hyprlang,
   hyprutils,
+  hyprwayland-scanner,
   pam,
   sdbus-cpp_2,
   systemdLibs,
@@ -27,20 +28,19 @@
 
 gcc14Stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlock";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-41/fFxlGCf1q+WJwdzSidr9+xJ7+td91XQ1+kzrZ+ts=";
+    hash = "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=";
   };
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     cmake
     pkg-config
+    hyprwayland-scanner
     wayland-scanner
   ];
 

From 7725f90a3deac52b86ec132f32221ffbe5ce8c38 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 4 Jan 2025 23:51:08 +0530
Subject: [PATCH 3/4] hyprpicker: fix build with hyprwayland-scanner-0.4.4

---
 pkgs/by-name/hy/hyprpicker/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix
index ecf77813b26b..9b923b52d39d 100644
--- a/pkgs/by-name/hy/hyprpicker/package.nix
+++ b/pkgs/by-name/hy/hyprpicker/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   nix-update-script,
   pkg-config,
   cmake,
@@ -29,6 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-gu26MSYbTlRLMUpZ9PeYXtqqhzPDQXxEDkjiJgwzIIc=";
   };
 
+  patches = [
+    # FIXME: remove in next release
+    (fetchpatch2 {
+      name = "fix-hypr-wayland-scanner-0.4.4-build.patch";
+      url = "https://github.com/hyprwm/hyprpicker/commit/444c40e5e3dc4058a6a762ba5e73ada6d6469055.patch?full_index=1";
+      hash = "sha256-tg+oCUHtQkOXDrUY1w1x8zWWO1v4YV8ZxQKuSWuX/AI=";
+    })
+  ];
+
   cmakeBuildType = if debug then "Debug" else "Release";
 
   nativeBuildInputs = [

From fa75c3e5bf5c61862a728a39bb1daca3a9a4634a Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 5 Jan 2025 00:01:34 +0530
Subject: [PATCH 4/4] hyprpaper: fix build with hyprwayland-scanner-0.4.4

---
 pkgs/by-name/hy/hyprpaper/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix
index d7c571e781a6..3ce41db29987 100644
--- a/pkgs/by-name/hy/hyprpaper/package.nix
+++ b/pkgs/by-name/hy/hyprpaper/package.nix
@@ -2,6 +2,7 @@
   lib,
   gcc14Stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   cairo,
   expat,
@@ -41,6 +42,15 @@ gcc14Stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IRZ5NrKFwBVueYrZYUQfpTwp2rZHgAkPwgvdnfVBF8E=";
   };
 
+  patches = [
+    # FIXME: remove in next release
+    (fetchpatch2 {
+      name = "fix-hypr-wayland-scanner-0.4.4-build.patch";
+      url = "https://github.com/hyprwm/hyprpaper/commit/505e447b6c48e6b49f3aecf5da276f3cc5780054.patch?full_index=1";
+      hash = "sha256-Vk2P2O4XQiCYqV0KbK/ADe8KPmaTs3Mg7JRJ3cGW9lM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config