From d26f8c444f868278b1dfe764daa049b40a986694 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 4 Sep 2021 18:43:33 -0300 Subject: st: small cosmetic rewrite --- pkgs/applications/terminal-emulators/st/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/terminal-emulators') diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 591b68b49ab00..3a2180ce8d82e 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -2,34 +2,33 @@ , stdenv , fetchurl , pkg-config -, writeText -, libX11 -, ncurses , fontconfig , freetype +, libX11 , libXft +, ncurses +, writeText , conf ? null , patches ? [ ] , extraLibs ? [ ] }: -with lib; - stdenv.mkDerivation rec { pname = "st"; version = "0.8.4"; src = fetchurl { url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - sha256 = "19j66fhckihbg30ypngvqc9bcva47mp379ch5vinasjdxgn3qbfl"; + hash = "sha256-1C087OtNamXjLpClM249RG22EsP72evBeAvGyaAzRqY="; }; inherit patches; - configFile = optionalString (conf != null) (writeText "config.def.h" conf); + configFile = lib.optionalString (conf != null) + (writeText "config.def.h" conf); - postPatch = optionalString (conf != null) "cp ${configFile} config.def.h" - + optionalString stdenv.isDarwin '' + postPatch = lib.optionalString (conf != null) "cp ${configFile} config.def.h" + + lib.optionalString stdenv.isDarwin '' substituteInPlace config.mk --replace "-lrt" "" ''; @@ -52,11 +51,13 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall + TERMINFO=$out/share/terminfo make install PREFIX=$out + runHook postInstall ''; - meta = { + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; -- cgit 1.4.1 From 72dfd9f635c1d1f702e05445865f076ca3d0565b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 4 Sep 2021 19:07:29 -0300 Subject: xst: small cosmetic rewrite --- pkgs/applications/terminal-emulators/st/xst.nix | 27 ++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/terminal-emulators') diff --git a/pkgs/applications/terminal-emulators/st/xst.nix b/pkgs/applications/terminal-emulators/st/xst.nix index baa71a09b9ebe..b8bceda50dcd4 100644 --- a/pkgs/applications/terminal-emulators/st/xst.nix +++ b/pkgs/applications/terminal-emulators/st/xst.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libX11, ncurses, libXext, libXft, fontconfig }: +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: stdenv.mkDerivation rec { pname = "xst"; @@ -11,11 +20,23 @@ stdenv.mkDerivation rec { sha256 = "nOJcOghtzFkl7B/4XeXptn2TdrGQ4QTKBo+t+9npxOA="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libX11 ncurses libXext libXft fontconfig ]; + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + libX11 + libXext + libXft + ncurses + ]; installPhase = '' + runHook preInstall + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall ''; meta = with lib; { -- cgit 1.4.1 From 2312cef179544db7bedf6c9464a12ad41cd7eea6 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 5 Sep 2021 00:01:54 -0300 Subject: lukesmithxyz-st: init at 0.0.0+unstable=2021-08-10 --- .../lukesmithxyz-st/0000-makefile-fix-install.diff | 14 ++++++ .../st/lukesmithxyz-st/default.nix | 56 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff create mode 100644 pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix (limited to 'pkgs/applications/terminal-emulators') diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff new file mode 100644 index 0000000000000..f451297dffa9d --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/0000-makefile-fix-install.diff @@ -0,0 +1,14 @@ +diff -Naur old/Makefile new/Makefile +--- old/Makefile 1969-12-31 21:00:01.000000000 -0300 ++++ new/Makefile 2021-09-06 00:10:26.972466947 -0300 +@@ -40,8 +40,8 @@ + rm -rf st-$(VERSION) + + install: st +- git submodule init +- git submodule update ++# git submodule init ++# git submodule update + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp -f st $(DESTDIR)$(PREFIX)/bin + cp -f st-copyout $(DESTDIR)$(PREFIX)/bin diff --git a/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix new file mode 100644 index 0000000000000..f285d0fc73b92 --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/lukesmithxyz-st/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, harfbuzz +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "lukesmithxyz-st"; + version = "0.0.0+unstable=2021-08-10"; + + src = fetchFromGitHub { + owner = "LukeSmithxyz"; + repo = "st"; + rev = "e053bd6036331cc7d14f155614aebc20f5371d3a"; + hash = "sha256-WwjuNxWoeR/ppJxJgqD20kzrn1kIfgDarkTOedX/W4k="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXext + libXft + ncurses + ]; + + patches = [ + # eliminate useless calls to git inside Makefile + ./0000-makefile-fix-install.diff + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/LukeSmithxyz/st"; + description = "Luke Smith's fork of st"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c0ca19eade2..57d9409e02b8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1015,6 +1015,9 @@ with pkgs; extraLibs = config.st.extraLibs or []; }; xst = callPackage ../applications/terminal-emulators/st/xst.nix { }; + lukesmithxyz-st = callPackage ../applications/terminal-emulators/st/lukesmithxyz-st { }; + mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { }; + siduck76-st = callPackage ../applications/terminal-emulators/st/siduck76-st.nix { }; stupidterm = callPackage ../applications/terminal-emulators/stupidterm { gtk = gtk3; -- cgit 1.4.1 From ba2821244fd62899355797ca7a5c17d414d96ccf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 6 Sep 2021 00:18:06 -0300 Subject: mcaimi-st: init at 0.0.0+unstable=2021-08-30 --- .../terminal-emulators/st/mcaimi-st.nix | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/st/mcaimi-st.nix (limited to 'pkgs/applications/terminal-emulators') diff --git a/pkgs/applications/terminal-emulators/st/mcaimi-st.nix b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix new file mode 100644 index 0000000000000..847638f304f36 --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/mcaimi-st.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "mcaimi-st"; + version = "0.0.0+unstable=2021-08-30"; + + src = fetchFromGitHub { + owner = "mcaimi"; + repo = "st"; + rev = "1a8cad03692ee6d32c03a136cdc76bdb169e15d8"; + hash = "sha256-xyVEvD8s1J9Wj9NB4Gg+0ldvde7M8IVpzCOTttC1IY0="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + libX11 + libXext + libXft + ncurses + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/gnotclub/xst"; + description = "Suckless Terminal fork"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} -- cgit 1.4.1 From 53d26fbfba153b4d4e01dfdc1c3bc93558c13c93 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 5 Sep 2021 00:55:38 -0300 Subject: siduck76-st: init at 0.0.0+unstable=2021-08-20 --- .../terminal-emulators/st/siduck76-st.nix | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 pkgs/applications/terminal-emulators/st/siduck76-st.nix (limited to 'pkgs/applications/terminal-emulators') diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix new file mode 100644 index 0000000000000..55fcebff0e3d6 --- /dev/null +++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, fontconfig +, harfbuzz +, libX11 +, libXext +, libXft +, ncurses +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "siduck76-st"; + version = "0.0.0+unstable=2021-08-20"; + + src = fetchFromGitHub { + owner = "siduck76"; + repo = "st"; + rev = "c9bda1de1f3f94ba507fa0eacc96d6a4f338637f"; + hash = "sha256-5n+QkSlVhhku7adtl7TuWhDl3zdwFaXc7Ot1RaIN54A="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + fontconfig + harfbuzz + libX11 + libXext + libXft + ncurses + ]; + + installPhase = '' + runHook preInstall + + TERMINFO=$out/share/terminfo make install PREFIX=$out + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/siduck76/st"; + description = "A fork of st with many add-ons"; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} -- cgit 1.4.1