From c4045a54b42d02e16dd3f1f6761a13b920dcd2f0 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 22 Sep 2024 08:58:42 +0300
Subject: [PATCH 1/2] waycorner: move to by-name overlay; format via nixfmt

---
 .../wa/waycorner/package.nix}                      | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/misc/waycorner/default.nix => by-name/wa/waycorner/package.nix} (91%)

diff --git a/pkgs/applications/misc/waycorner/default.nix b/pkgs/by-name/wa/waycorner/package.nix
similarity index 91%
rename from pkgs/applications/misc/waycorner/default.nix
rename to pkgs/by-name/wa/waycorner/package.nix
index 2d1303bb26c7..0c850dfa4cfa 100644
--- a/pkgs/applications/misc/waycorner/default.nix
+++ b/pkgs/by-name/wa/waycorner/package.nix
@@ -1,10 +1,10 @@
-{ lib
-, makeWrapper
-, rustPlatform
-, pkg-config
-, fetchFromGitHub
-, wayland
-,
+{
+  lib,
+  makeWrapper,
+  rustPlatform,
+  pkg-config,
+  fetchFromGitHub,
+  wayland,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "waycorner";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d90dcf21119..0484cff1219c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30375,8 +30375,6 @@ with pkgs;
 
   remontoire = callPackage ../applications/misc/remontoire { };
 
-  waycorner = callPackage ../applications/misc/waycorner { };
-
   wayshot = callPackage ../tools/misc/wayshot { };
 
   waylevel = callPackage ../tools/misc/waylevel { };

From 68c7d64d1a3e01266645f0d9a5266fc8df7052c9 Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Sun, 22 Sep 2024 09:14:20 +0300
Subject: [PATCH 2/2] waycorner: modernize derivation

- Use `refs/tags/${version}` over ${version}
- Get rid of nested `with lib;`
- Remove redundant build input (tested build & functionality)
- Update changelog link to use current ref
---
 pkgs/by-name/wa/waycorner/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix
index 0c850dfa4cfa..4ca5ca58b04c 100644
--- a/pkgs/by-name/wa/waycorner/package.nix
+++ b/pkgs/by-name/wa/waycorner/package.nix
@@ -9,33 +9,34 @@
 rustPlatform.buildRustPackage rec {
   pname = "waycorner";
   version = "0.2.3";
+
   src = fetchFromGitHub {
     owner = "AndreasBackx";
     repo = "waycorner";
-    rev = version;
+    rev = "refs/tags/${version}";
     hash = "sha256-b8juIhJ3kh+NJc8RUVVoatqjWISSW0ir/vk2Dz/428Y=";
   };
+
   cargoHash = "sha256-LGxFRGzQ8jOfxT5di3+YGqfS5KM4+Br6KlTFpPbkJyU=";
-  buildInputs = [
-    wayland
-  ];
+
   nativeBuildInputs = [
     pkg-config
     makeWrapper
   ];
+
   postFixup = ''
     # the program looks for libwayland-client.so at runtime
     wrapProgram $out/bin/waycorner \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Hot corners for Wayland";
     mainProgram = "waycorner";
-    changelog = "https://github.com/AndreasBackx/waycorner/blob/main/CHANGELOG.md";
+    changelog = "https://github.com/AndreasBackx/waycorner/blob/${version}/CHANGELOG.md";
     homepage = "https://github.com/AndreasBackx/waycorner";
-    platforms = platforms.linux;
-    license = licenses.mit;
-    maintainers = with maintainers; [ NotAShelf ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ NotAShelf ];
   };
 }