ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #37105 from Ekleog/st-0.8

Browse Source 
st: 0.7 -> 0.8
This commit is contained in:
Gabriel Ebner 2018-03-17 15:59:22 +01:00 committed by GitHub
commit fe8c36ade5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/st/default.nix
View File

@ -5,14 +5,14 @@ with stdenv.lib;
let patches' = if patches == null then [] else patches; let patches' = if patches == null then [] else patches;
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "st-0.7"; name = "st-0.8";
src = fetchurl { src = fetchurl {
url = "http://dl.suckless.org/st/${name}.tar.gz"; url = "http://dl.suckless.org/st/${name}.tar.gz";
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000"; sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
}; };
patches = patches' ++ [ ./st-fix-deletekey.patch ]; patches = patches';
configFile = optionalString (conf!=null) (writeText "config.def.h" conf); configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";

15
pkgs/applications/misc/st/st-fix-deletekey.patch
View File

@ -1,15 +0,0 @@
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},