diff options
| author | Tim Keller <tjk@tjkeller.xyz> | 2025-07-02 13:15:38 -0500 |
|---|---|---|
| committer | Tim Keller <tjk@tjkeller.xyz> | 2025-07-02 13:15:38 -0500 |
| commit | b4f2e460e772a3b657c553accd4b61d3bdd050ef (patch) | |
| tree | dd7bacc3154d4a321e1d6554cec8bb0956680be4 | |
| parent | 7faa924a2275676bbd13f221afbcb1c0d41ea388 (diff) | |
| download | nixos-b4f2e460e772a3b657c553accd4b61d3bdd050ef.tar.xz nixos-b4f2e460e772a3b657c553accd4b61d3bdd050ef.zip | |
override existing st derivation instead of creating a new one from scratch
| -rw-r--r-- | derivations/st/default.nix | 35 | ||||
| -rw-r--r-- | derivations/st/overrides.nix | 19 | ||||
| -rw-r--r-- | modules/root/software/overlays.nix | 2 |
3 files changed, 20 insertions, 36 deletions
diff --git a/derivations/st/default.nix b/derivations/st/default.nix deleted file mode 100644 index 4a527e3..0000000 --- a/derivations/st/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, fetchzip -, fontconfig -, libX11 -, libXcursor -, libXext -, libXft -, ncurses -, pkg-config -, stdenv -}: - -stdenv.mkDerivation rec { - pname = "st"; - version = "tj-0.9.2.3"; - - src = fetchzip { - url = "https://git.tjkeller.xyz/${pname}/snapshot/${pname}-${version}.tar.xz"; - sha256 = "sha256-SQ62io4LWsPBvX8e9vUwVVXs/2+THoR6ZZoldQ6IUJk="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fontconfig libX11 libXcursor libXext libXft ncurses ]; - - makeFlags = [ "CFLAGS=-Ofast" ]; - installFlags = [ "PREFIX=$(out)" "TERMINFO=$(out)/share/terminfo" ]; - - 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 ]; + }; + }); +} diff --git a/modules/root/software/overlays.nix b/modules/root/software/overlays.nix index 04ad398..bdb23fd 100644 --- a/modules/root/software/overlays.nix +++ b/modules/root/software/overlays.nix @@ -3,7 +3,6 @@ (final: prev: { crazydiskinfo = (callPackage ./derivations/crazydiskinfo {}); lowbat = (callPackage ./derivations/lowbat {}); - st = (callPackage ./derivations/st {}); workcentre-7800-series = (callPackage ./derivations/xerox-workcentre-7800-series-driver {}); # Use my vimv-rs until pr gets merged @@ -16,5 +15,6 @@ }; }); }) + (import ./derivations/st/overrides.nix) ]; } |