From 78e7bb6ad583bb5e9f0d3a58a175a1c7f018b543 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 23 Jul 2025 20:11:46 +0300
Subject: [PATCH] greetd: clean up and modernize

- removed `with lib;`
- replaced `rec` with `finalAttrs`
- removed redundant `useFetchCargoVendor`
- updated fetcher attrs
---
 pkgs/by-name/gr/greetd/package.nix | 45 +++++++++++++++++-------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/gr/greetd/package.nix b/pkgs/by-name/gr/greetd/package.nix
index 52a9d87f9c5e..2cc5aa18ad13 100644
--- a/pkgs/by-name/gr/greetd/package.nix
+++ b/pkgs/by-name/gr/greetd/package.nix
@@ -6,7 +6,6 @@
   scdoc,
   installShellFiles,
   # legacy passthrus
-  greetd,
   gtkgreet,
   qtgreet,
   regreet,
@@ -14,15 +13,15 @@
   wlgreet,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "greetd";
   version = "0.10.3";
 
   src = fetchFromSourcehut {
     owner = "~kennylevinsen";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
+    repo = "greetd";
+    rev = finalAttrs.version;
+    hash = "sha256-jgvYnjt7j4uubpBxrYM3YiUfF1PWuHAN1kwnv6Y+bMg=";
   };
 
   cargoHash = "sha256-JwTLZawY9+M09IDbMPoNUcNrnW1C2OVlEVn1n7ol6dY=";
@@ -45,18 +44,24 @@ rustPlatform.buildRustPackage rec {
   '';
 
   # Added 2025-07-23. To be deleted on 26.05
-  passthru = lib.mapAttrs (k: lib.warnOnInstantiate "`greetd.${k}` was renamed to `${k}`") {
-    inherit
-      greetd
-      gtkgreet
-      qtgreet
-      regreet
-      tuigreet
-      wlgreet
-      ;
-  };
+  passthru =
+    let
+      warnPassthru = name: lib.warnOnInstantiate "`greetd.${name}` was renamed to `${name}`";
+    in
+    lib.mapAttrs warnPassthru {
+      inherit
+        gtkgreet
+        qtgreet
+        regreet
+        tuigreet
+        wlgreet
+        ;
+    }
+    // {
+      greetd = warnPassthru "greetd" finalAttrs.finalPackage;
+    };
 
-  meta = with lib; {
+  meta = {
     description = "Minimal and flexible login manager daemon";
     longDescription = ''
       greetd is a minimal and flexible login manager daemon
@@ -65,8 +70,8 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://sr.ht/~kennylevinsen/greetd/";
     mainProgram = "greetd";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ];
+    platforms = lib.platforms.linux;
   };
-}
+})