Merge branch 'fix/st-update-0.7' of git://github.com/andsild/nixpkgs
This commit is contained in:
commit
d81d59aad9
|
@ -33,6 +33,7 @@
|
|||
anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
|
||||
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
|
||||
andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
|
||||
andsild = "Anders Sildnes <andsild@gmail.com>";
|
||||
aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
|
||||
antono = "Antono Vasiljev <self@antono.info>";
|
||||
ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
|
||||
|
|
|
@ -1,33 +1,32 @@
|
|||
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig
|
||||
, conf ? null, patches ? []}:
|
||||
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
|
||||
, fontconfig, conf ? null, patches ? []}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "st-0.6";
|
||||
|
||||
let patches' = if isNull patches then [] else patches;
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "st-0.7";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://dl.suckless.org/st/${name}.tar.gz";
|
||||
sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5";
|
||||
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
|
||||
};
|
||||
|
||||
inherit patches;
|
||||
patches = patches' ++ [ ./st-fix-deletekey.patch ];
|
||||
|
||||
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
|
||||
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
|
||||
|
||||
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
|
||||
|
||||
NIX_LDFLAGS = "-lfontconfig";
|
||||
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
|
||||
|
||||
installPhase = ''
|
||||
TERMINFO=$out/share/terminfo make install PREFIX=$out
|
||||
'';
|
||||
|
||||
|
||||
meta = {
|
||||
homepage = http://st.suckless.org/;
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = with maintainers; [viric];
|
||||
maintainers = with maintainers; [viric andsild];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
15
pkgs/applications/misc/st/st-fix-deletekey.patch
Normal file
15
pkgs/applications/misc/st/st-fix-deletekey.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
diff --git a/config.def.h b/config.def.h
|
||||
index 1896246..b41747f 100644
|
||||
--- a/config.def.h
|
||||
+++ b/config.def.h
|
||||
@@ -315,8 +315,8 @@ static Key key[] = {
|
||||
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
|
||||
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
|
||||
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
|
||||
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
|
||||
- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
|
||||
+ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0},
|
||||
+ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0},
|
||||
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
|
||||
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
|
||||
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
|
Loading…
Reference in a new issue