From 18448d340ac94e8c5ce760023b0b579d1da6609f Mon Sep 17 00:00:00 2001
From: Sam <samual.shop@proton.me>
Date: Thu, 13 Jun 2024 17:44:06 +0100
Subject: [PATCH] dwmblocks derivation

---
 pkgs/dwmblocks/default.nix | 33 +++++++++++++++++++++++++++++++++
 pkgs/st/default.nix        | 16 +---------------
 2 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/dwmblocks/default.nix

diff --git a/pkgs/dwmblocks/default.nix b/pkgs/dwmblocks/default.nix
new file mode 100644
index 0000000..b50e29f
--- /dev/null
+++ b/pkgs/dwmblocks/default.nix
@@ -0,0 +1,33 @@
+{ pkgs ? import <nixpkgs> { }
+, fetchFromGitea ? pkgs.fetchFromGitea
+  #, stdenv ? pkgs.stdenv
+  #, pkg-config ? pkgs.pkg-config
+  #, fontconfig ? pkgs.fontconfig
+  #, freetype ? pkgs.freetype
+  #, libX11 ? pkgs.xorg.libX11
+  #, libXft ? pkgs.xorg.libXft
+  #, ncurses ? pkgs.ncurses
+  #, extraLibs ? [ ]
+}:
+pkgs.stdenv.mkDerivation {
+  pname = "dwmblocks";
+  name = "dwmblocks";
+
+  src = fetchFromGitea {
+    domain = "git.bitlab21.com";
+    owner = "sam";
+    repo = "dwmblocks";
+    rev = "c4e7a9b1eb98123e239ba76bc551934721fd18ca";
+    sha256 = "sha256-4W9w/Efk+YCSP1VuUFr+jPXIyrlpktwxRPUOZHTAtx8=";
+  };
+
+  buildPhase = ''
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/usr/local/bin
+    mv st $out/usr/local/bin
+  '';
+
+}
diff --git a/pkgs/st/default.nix b/pkgs/st/default.nix
index ad3ba63..fffa40e 100644
--- a/pkgs/st/default.nix
+++ b/pkgs/st/default.nix
@@ -1,13 +1,8 @@
 { pkgs ? import <nixpkgs> { }
 , fetchFromGitea ? pkgs.fetchFromGitea
-, stdenv ? pkgs.stdenv
 , pkg-config ? pkgs.pkg-config
-, fontconfig ? pkgs.fontconfig
-, freetype ? pkgs.freetype
 , libX11 ? pkgs.xorg.libX11
 , libXft ? pkgs.xorg.libXft
-, ncurses ? pkgs.ncurses
-, extraLibs ? [ ]
 }:
 pkgs.stdenv.mkDerivation {
   pname = "st";
@@ -21,23 +16,14 @@ pkgs.stdenv.mkDerivation {
     sha256 = "sha256-4W9w/Efk+YCSP1VuUFr+jPXIyrlpktwxRPUOZHTAtx8=";
   };
 
-  makeFlags = [
-    "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
-  ];
-
   nativeBuildInputs = [
     pkg-config
-    ncurses
-    fontconfig
-    freetype
   ];
 
   buildInputs = [
     libX11
     libXft
-  ] ++ extraLibs;
-
-  installFlags = [ "PREFIX=$(out)" ];
+  ];
 
   buildPhase = ''
     make