Merge pull request #27289 from vyp/patch/xst-init

xst: init at 0.7.1
This commit is contained in:
Jörg Thalheim 2017-07-12 21:46:42 +01:00 committed by GitHub
commit 3d380b9082
5 changed files with 37 additions and 3 deletions

View File

@ -597,6 +597,7 @@
volth = "Jaroslavas Pocepko <jaroslavas@volth.com>";
vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
vrthra = "Rahul Gopinath <rahul@gopinath.org>";
vyp = "vyp <elisp.vim@gmail.com>";
wedens = "wedens <kirill.wedens@gmail.com>";
willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";

View File

@ -3,7 +3,7 @@
with stdenv.lib;
let patches' = if isNull patches then [] else patches;
let patches' = if patches == null then [] else patches;
in stdenv.mkDerivation rec {
name = "st-0.7";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
meta = {
homepage = http://st.suckless.org/;
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = with maintainers; [viric andsild];
platforms = platforms.linux;
};

View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://st.suckless.org/;
license = stdenv.lib.licenses.mit;
license = licenses.mit;
maintainers = with maintainers; [ ];
platforms = with platforms; linux;
};

View File

@ -0,0 +1,31 @@
{ stdenv, fetchFromGitHub, pkgconfig, libX11, ncurses, libXext, libXft, fontconfig }:
with stdenv.lib;
let
version = "0.7.1";
name = "xst-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchFromGitHub {
owner = "neeasade";
repo = "xst";
rev = "v${version}";
sha256 = "1fh4y2w0icaij99kihl3w8j5d5b38d72afp17c81pi57f43ss6pc";
};
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
installPhase = ''
TERMINFO=$out/share/terminfo make install PREFIX=$out
'';
meta = {
homepage = "https://github.com/neeasade/xst";
description = "Simple terminal fork that can load config from Xresources";
license = licenses.mit;
maintainers = maintainers.vyp;
platforms = platforms.linux;
};
}

View File

@ -15967,6 +15967,8 @@ with pkgs;
patches = config.st.patches or null;
};
xst = callPackage ../applications/misc/st/xst.nix { };
stag = callPackage ../applications/misc/stag {
curses = ncurses;
};