2 files changed, 24 insertions, 87 deletions

diff --git a/pkgs/tools/text/hottext/default.nix b/pkgs/tools/text/hottext/default.nix
index ca0cbf9d1a09..6fe7a686c100 100644
--- a/pkgs/tools/text/hottext/default.nix
+++ b/pkgs/tools/text/hottext/default.nix
@@ -1,81 +1,30 @@
-{ lib, stdenv, fetchurl, fetchFromGitHub, nim, gentium, SDL2, makeDesktopItem }:
+{ lib, nimPackages, fetchurl, gentium, makeDesktopItem }:
 
-let
-  treeformLibs = lib.attrsets.mapAttrsToList (repo: args:
-    fetchFromGitHub ({
-      inherit repo;
-      owner = "treeform";
-    } // args)) {
-      bumpy = {
-        rev = "1.0.3";
-        sha256 = "sha256-mDmDlhOGoYYjKgF5j808oT2NqRlfcOdLSDE3WtdJFQ0=";
-      };
-      chroma = {
-        rev = "0.2.5";
-        sha256 = "sha256-6lNHpO2aMorgkaPfo6kRcOs9r5R6T/kislVmkeoulw8=";
-      };
-      flatty = {
-        rev = "0.2.1";
-        sha256 = "sha256-TqNnRh2+i6n98ktLRVQxt9CVw17FGLNYq29rJoMus/0=";
-      };
-      pixie = {
-        rev = "1.1.3";
-        sha256 = "sha256-xKIejVxOd19mblL1ZwpJH91dgKQS5g8U08EL8lGGelA=";
-      };
-      typography = {
-        rev = "0.7.9";
-        sha256 = "sha256-IYjw3PCp5XzVed2fGGCt9Hb60cxFeF0BUZ7L5PedTLU=";
-      };
-      vmath = {
-        rev = "1.0.3";
-        sha256 = "sha256-zzSKXjuTZ46HTFUs0N47mxEKTKIdS3dwr+60sQYSdn0=";
-      };
-    };
-
-  nimLibs = treeformLibs ++ [
-    (fetchFromGitHub {
-      owner = "nim-lang";
-      repo = "sdl2";
-      rev = "v2.0.2";
-      sha256 = "sha256-Ivx/gxDa2HVDjCVrJVu23i4d0pDzzv+ThmwqNjtkjsA=";
-    })
-    (fetchFromGitHub {
-      owner = "guzba";
-      repo = "nimsimd";
-      rev = "1.0.0";
-      sha256 = "sha256-kp61fylAJ6MSN9hLYLi7CU2lxVR/lbrNCvZTe0LJLGo=";
-    })
-    (fetchFromGitHub {
-      owner = "guzba";
-      repo = "zippy";
-      rev = "0.5.6";
-      sha256 = "sha256-axp4t9+8TFSpvnATlRKZyuOGLA0e/XKfvrVSwreXpC4=";
-    })
-  ];
-
-in stdenv.mkDerivation rec {
+nimPackages.buildNimPackage rec {
   pname = "hottext";
   version = "1.4";
 
+  nimBinOnly = true;
+
   src = fetchurl {
     url = "https://git.sr.ht/~ehmry/hottext/archive/v${version}.tar.gz";
     sha256 = "sha256-hIUofi81zowSMbt1lUsxCnVzfJGN3FEiTtN8CEFpwzY=";
   };
 
-  nativeBuildInputs = [ nim ];
-  buildInputs = [ SDL2 ];
-
-  nimFlags = [ "-d:release" ] ++ map (lib: "--path:${lib}/src") nimLibs;
+  buildInputs = with nimPackages; [
+    bumpy
+    chroma
+    flatty
+    nimsimd
+    pixie
+    sdl2
+    typography
+    vmath
+    zippy
+  ];
 
   HOTTEXT_FONT_PATH = "${gentium}/share/fonts/truetype/GentiumPlus-Regular.ttf";
 
-  buildPhase = ''
-    runHook preBuild
-    HOME=$TMPDIR
-    nim $nimFlags compile src/$pname
-    runHook postBuild
-  '';
-
   desktopItem = makeDesktopItem {
     categories = "Utility;";
     comment = meta.description;
@@ -84,11 +33,8 @@ in stdenv.mkDerivation rec {
     name = pname;
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -Dt $out/bin src/$pname
+  postInstall = ''
     cp -r $desktopItem/* $out
-    runHook postInstall
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/wayland/swaycwd/default.nix b/pkgs/tools/wayland/swaycwd/default.nix
index 36e223f8d4ca..401144f74d2a 100644
--- a/pkgs/tools/wayland/swaycwd/default.nix
+++ b/pkgs/tools/wayland/swaycwd/default.nix
@@ -1,8 +1,8 @@
-{ lib, nim, stdenv, fetchFromGitLab
+{ lib, nimPackages, fetchFromGitLab
 , enableShells ? [ "bash" "zsh" "fish" "sh" "posh" ]
 }:
 
-stdenv.mkDerivation {
+nimPackages.buildNimPackage {
     name = "swaycwd";
     version = "0.0.1";
 
@@ -13,27 +13,18 @@ stdenv.mkDerivation {
       hash = "sha256-MkyY3wWByQo0l0J28xKDfGtxfazVPRyZHCObl9Fszh4=";
     };
 
-    configurePhase = ''
-      runHook preConfigure
+    preConfigure = ''
       {
         echo 'let enabledShells: seq[string] = @${builtins.toJSON enableShells}'
         echo 'export enabledShells'
       } > shells.nim
-      runHook postConfigure
+      cat << EOF > swaycwd.nimble
+      srcDir = "."
+      bin = "swaycwd"
+      EOF
     '';
 
-    nativeBuildInputs = [ nim ];
-
-    buildPhase = ''
-      export HOME=$TMPDIR
-      nim c --opt:speed -d:release swaycwd.nim
-    '';
-
-    installPhase = ''
-      runHook preInstall
-      install -D -m555 -t $out/bin swaycwd
-      runHook postInstall
-    '';
+    nimFlags = [ "--opt:speed" ];
 
     meta = with lib; {
       homepage = "https://gitlab.com/cab404/swaycwd";