From 557aac6e99a64664575448fe91c830ac14d5d3d4 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sun, 19 May 2024 09:10:42 -0400
Subject: [PATCH 1/2] waylock: move to by-name

---
 .../misc/waylock/default.nix => by-name/wa/waylock/package.nix} | 0
 pkgs/{applications/misc => by-name/wa}/waylock/update.nu        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/waylock/default.nix => by-name/wa/waylock/package.nix} (100%)
 rename pkgs/{applications/misc => by-name/wa}/waylock/update.nu (100%)

diff --git a/pkgs/applications/misc/waylock/default.nix b/pkgs/by-name/wa/waylock/package.nix
similarity index 100%
rename from pkgs/applications/misc/waylock/default.nix
rename to pkgs/by-name/wa/waylock/package.nix
diff --git a/pkgs/applications/misc/waylock/update.nu b/pkgs/by-name/wa/waylock/update.nu
similarity index 100%
rename from pkgs/applications/misc/waylock/update.nu
rename to pkgs/by-name/wa/waylock/update.nu
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f800aaa51d77..359735fa16f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31719,8 +31719,6 @@ with pkgs;
 
   waycorner = callPackage ../applications/misc/waycorner { };
 
-  waylock = callPackage ../applications/misc/waylock { };
-
   wayshot = callPackage ../tools/misc/wayshot { };
 
   waylevel = callPackage ../tools/misc/waylevel { };

From dd928b508c14032580665423d02652bf53ba44a6 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Mon, 20 May 2024 22:55:46 -0400
Subject: [PATCH 2/2] waylock: 1.0.0 -> 1.1.0

Changelog: https://codeberg.org/ifreund/waylock/releases/tag/v1.1.0
---
 pkgs/by-name/wa/waylock/build.zig.zon.nix | 20 +++++++++++
 pkgs/by-name/wa/waylock/package.nix       | 41 ++++++++++++++---------
 pkgs/by-name/wa/waylock/update.nu         |  5 ++-
 3 files changed, 50 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/by-name/wa/waylock/build.zig.zon.nix

diff --git a/pkgs/by-name/wa/waylock/build.zig.zon.nix b/pkgs/by-name/wa/waylock/build.zig.zon.nix
new file mode 100644
index 000000000000..a0d4d9ac0971
--- /dev/null
+++ b/pkgs/by-name/wa/waylock/build.zig.zon.nix
@@ -0,0 +1,20 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{ linkFarm, fetchzip }:
+
+linkFarm "zig-packages" [
+  {
+    name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";
+      hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";
+    };
+  }
+  {
+    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
+      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
+    };
+  }
+]
diff --git a/pkgs/by-name/wa/waylock/package.nix b/pkgs/by-name/wa/waylock/package.nix
index 9ed2cc12131e..a4b8facf555d 100644
--- a/pkgs/by-name/wa/waylock/package.nix
+++ b/pkgs/by-name/wa/waylock/package.nix
@@ -1,18 +1,20 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, libxkbcommon
-, pam
-, pkg-config
-, scdoc
-, wayland
-, wayland-protocols
-, zig_0_11
+{
+  lib,
+  stdenv,
+  callPackage,
+  fetchFromGitea,
+  libxkbcommon,
+  pam,
+  pkg-config,
+  scdoc,
+  wayland,
+  wayland-protocols,
+  zig_0_12,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waylock";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
@@ -20,14 +22,16 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "waylock";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-Z5YNaR+jocJ4hS7NT8oAlrMnqNfD8KRzOyyqdVGDSl0=";
+    hash = "sha256-U8xJucLpmeLdmSUc+AVSH/mlv6UOXsxotJPTMK7lnkA=";
   };
 
+  deps = callPackage ./build.zig.zon.nix { };
+
   nativeBuildInputs = [
     pkg-config
     scdoc
     wayland
-    zig_0_11.hook
+    zig_0_12.hook
   ];
 
   buildInputs = [
@@ -36,7 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
     pam
   ];
 
-  zigBuildFlags = [ "-Dman-pages" ];
+  zigBuildFlags = [
+    "-Dman-pages"
+    "--system"
+    "${finalAttrs.deps}"
+  ];
 
   passthru.updateScript = ./update.nu;
 
@@ -45,7 +53,10 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://codeberg.org/ifreund/waylock/releases/tag/v${finalAttrs.version}";
     description = "A small screenlocker for Wayland compositors";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ adamcstephens jordanisaacs ];
+    maintainers = with lib.maintainers; [
+      adamcstephens
+      jordanisaacs
+    ];
     mainProgram = "waylock";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/wa/waylock/update.nu b/pkgs/by-name/wa/waylock/update.nu
index 514a755db1a3..e227fb646517 100755
--- a/pkgs/by-name/wa/waylock/update.nu
+++ b/pkgs/by-name/wa/waylock/update.nu
@@ -1,5 +1,8 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i nu -p nushell common-updater-scripts
+#!nix-shell -i nu -p nushell common-updater-scripts zon2nix
 
 let latest_tag = list-git-tags --url=https://codeberg.org/ifreund/waylock | lines | sort --natural | str replace v '' | last
 update-source-version waylock $latest_tag
+
+http get $"https://codeberg.org/ifreund/waylock/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon
+zon2nix > pkgs/by-name/wa/waylock/build.zig.zon.nix