diff options
| author | asildnes <andsild@gmail.com> | 2016-09-03 14:30:22 +0200 |
|---|---|---|
| committer | asildnes <andsild@gmail.com> | 2016-09-06 22:00:19 +0200 |
| commit | 29aac270898118a446255ec00540e5ef258f802c (patch) | |
| tree | 6e9c32ac4a681f41a200130f6692fa8e8c4f0528 /pkgs/applications/misc/st | |
| parent | 2ae5fb27239cbf75cee83c1396809d7acc6bbd8d (diff) | |
| download | nixpkgs-29aac270898118a446255ec00540e5ef258f802c.tar nixpkgs-29aac270898118a446255ec00540e5ef258f802c.tar.gz nixpkgs-29aac270898118a446255ec00540e5ef258f802c.tar.bz2 nixpkgs-29aac270898118a446255ec00540e5ef258f802c.tar.lz nixpkgs-29aac270898118a446255ec00540e5ef258f802c.tar.xz nixpkgs-29aac270898118a446255ec00540e5ef258f802c.tar.zst nixpkgs-29aac270898118a446255ec00540e5ef258f802c.zip | |
st: 0.6 -> 0.7
Diffstat (limited to 'pkgs/applications/misc/st')
| -rw-r--r-- | pkgs/applications/misc/st/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/applications/misc/st/st-fix-deletekey.patch | 15 |
2 files changed, 26 insertions, 12 deletions
diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index deceba0ea55..704262da5bf 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -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; }; } diff --git a/pkgs/applications/misc/st/st-fix-deletekey.patch b/pkgs/applications/misc/st/st-fix-deletekey.patch new file mode 100644 index 00000000000..cf009322053 --- /dev/null +++ b/pkgs/applications/misc/st/st-fix-deletekey.patch @@ -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}, |