From 29b302705b282bedde66f1fe7f199e4a46be842f Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 31 Oct 2023 16:02:43 +0000
Subject: [PATCH] swaycwd: use new buildNimPackage

---
 .../default.nix => by-name/sw/swaycwd/package.nix}    | 11 ++++++-----
 pkgs/top-level/all-packages.nix                       |  2 --
 2 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{tools/wayland/swaycwd/default.nix => by-name/sw/swaycwd/package.nix} (87%)

diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/by-name/sw/swaycwd/package.nix
similarity index 87%
rename from pkgs/tools/wayland/swaycwd/default.nix
rename to pkgs/by-name/sw/swaycwd/package.nix
index 9ca91675a35f..1a3678c81c85 100644
--- a/pkgs/tools/wayland/swaycwd/default.nix
+++ b/pkgs/by-name/sw/swaycwd/package.nix
@@ -1,16 +1,17 @@
 { lib
-, nimPackages
+, buildNimPackage
 , fetchFromGitLab
 , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" "codium" ]
 }:
-nimPackages.buildNimPackage rec{
+
+buildNimPackage (finalAttrs: {
   pname = "swaycwd";
   version = "0.2.1";
 
   src = fetchFromGitLab {
     owner = "cab404";
-    repo = pname;
-    rev = "v${version}";
+    repo = finalAttrs.pname;
+    rev = "v${finalAttrs.version}";
     hash = "sha256-R/LnojbA0vBQVivGLaoM0+M4qVJ7vjf4kggB59i896w=";
   };
 
@@ -31,4 +32,4 @@ nimPackages.buildNimPackage rec{
     license = licenses.gpl3Only;
     mainProgram = "swaycwd";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9054cc5e7eaa..26227fb8ce15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4795,8 +4795,6 @@ with pkgs;
 
   swaykbdd = callPackage ../tools/wayland/swaykbdd { };
 
-  swaycwd = callPackage ../tools/wayland/swaycwd { };
-
   swayr = callPackage ../tools/wayland/swayr { };
 
   swayrbar = callPackage ../tools/wayland/swayrbar { };