St reworked to flake

5 files changed, 26 insertions, 15 deletions

diff --git a/extras/notes b/extras/notes
-Subproject 8215182af3d55b22a453bb0fe7a1fd57d2a9bcf
+Subproject 6dda73d7bdfbf34cf505c9f1f287a0228c4a869
diff --git a/packages/dwm/source b/packages/dwm/source
-Subproject 1c5b4ca401c4649aa8541d3b4cbac4293c33af2
+Subproject e3ecc116c0733d6ff6b7a652beae4289a59e924
diff --git a/packages/shotkey/source b/packages/shotkey/source
-Subproject bb913fb0b80b4880e950e8b089cf15d2a60ed97
+Subproject eaddd02b16bde1c96e95ea62964fd17006489b2
diff --git a/packages/st/pkg.nix b/packages/st/pkg.nix
index 80f558b..0dc06fd 100644
--- a/packages/st/pkg.nix
+++ b/packages/st/pkg.nix
@@ -1,17 +1,28 @@
-{ stdenv, pkgs, libX11, libXft, fontconfig, pkg-config, ncurses, imlib2 }:
+# { stdenv, libX11, libXft, fontconfig, freetype, pkg-config, ncurses, imlib2 }:
+#
+# stdenv.mkDerivation {
+#   pname = "local-st";
+#   version = "0.9.4";
+#
+#   src = ./source;
+#
+#   strictDeps = true;
+#   nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
+#   buildInputs = [ libX11 libXft fontconfig imlib2 ];
+#
+#   outputs = [ "out" ];
+#
+#   unpackPhase = ''cp -r $src/* .'';
+#
+#   makeFlags = [
+#     "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
+#   ];
+#   buildPhase = ''make'';
+#
+#   installFlags = [ "PREFIX=$(out)" "DESTDIR=''" ];
+#   installPhase = ''TERMINFO=$out/share/terminfo make install'';
+# }
 
-stdenv.mkDerivation rec {
-  name = "local-st-${version}";
-  version = "0.9.4";
+{...}:
+(builtins.getFlake "path:/home/imsohexy/nixos/packages/st/source").packages.x86_64-linux.default
 
-  src = ./source;
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 libXft fontconfig ncurses imlib2 ];
-
-  unpackPhase = ''cp -r $src/* .'';
-
-  buildPhase = ''make'';
-
-  installPhase = ''TERMINFO=$out/share/terminfo make PREFIX=$out DESTDIR="" install'';
-}
diff --git a/packages/st/source b/packages/st/source
-Subproject cd8c5ccf216c2db3b397e9ce674aa582c30a1e2
+Subproject c75c872abb5f91a858ebc90905dc76f7d2eefd7