2 files changed, 19 insertions, 50 deletions
diff --git a/derivations/st/default.nix b/derivations/st/default.nix
deleted file mode 100644
index eb7c6bc..0000000
--- a/derivations/st/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  fontconfig,
-  libX11,
-  libXcursor,
-  libXext,
-  libXft,
-  ncurses,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "st";
-  version = "tj-0.9.2.2";
-
-  src = fetchzip {
-    url = "https://git.tjkeller.xyz/${pname}/snapshot/${pname}-${version}.tar.xz";
-    sha256 = "sha256-p1u7TEeLeC5Kjvi8na4YhyQQ0qdPaUWZL6hq9O4HaKA=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-  buildInputs = [
-    fontconfig
-    libX11
-    libXcursor
-    libXext
-    libXft
-    ncurses
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    TERMINFO=$out/share/terminfo make install PREFIX=$out
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    homepage = "https://git.tjkeller.xyz/st";
-    description = "My st with various patches";
-    mainProgram = "st";
-    license = licenses.mit;
-    maintainers = [ maintainers.tjkeller ];
-  };
-}
diff --git a/derivations/st/overrides.nix b/derivations/st/overrides.nix
new file mode 100644
index 0000000..2d0a37e
--- /dev/null
+++ b/derivations/st/overrides.nix
@@ -0,0 +1,19 @@
+final: prev: {
+  st = prev.st.overrideAttrs (finalAttrs: previousAttrs: {
+    version = "tj-0.9.2.3";
+
+    src = prev.fetchgit {
+      url = "https://git.tjkeller.xyz/${previousAttrs.pname}";
+      tag = finalAttrs.version;
+      sha256 = "sha256-SQ62io4LWsPBvX8e9vUwVVXs/2+THoR6ZZoldQ6IUJk=";
+    };
+
+    makeFlags = previousAttrs.makeFlags ++ [ "CFLAGS=-Ofast" ];
+    buildInputs = with prev.pkgs.xorg; previousAttrs.buildInputs ++ [ libXcursor libXext ];
+
+    meta = with prev.lib; previousAttrs.meta // {
+      homepage = "https://git.tjkeller.xyz/st";
+      maintainers = previousAttrs.meta.maintainers ++ [ maintainers.tjkeller ];
+    };
+  });
+}