tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
st: 0.6 -> 0.7
asildnes
9 years ago
29aac270
2ae5fb27
+27
-12
3 changed files
expand all
collapse all
unified
split
lib
maintainers.nix
pkgs
applications
misc
st
default.nix
st-fix-deletekey.patch
+1
lib/maintainers.nix
···
33
anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
34
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
35
andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
0
36
aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
37
antono = "Antono Vasiljev <self@antono.info>";
38
ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
···
33
anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
34
andres = "Andres Loeh <ksnixos@andres-loeh.de>";
35
andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
36
+
andsild = "Anders Sildnes <andsild@gmail.com>";
37
aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
38
antono = "Antono Vasiljev <self@antono.info>";
39
ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
+11
-12
pkgs/applications/misc/st/default.nix
···
1
-
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft, fontconfig
2
-
, conf ? null, patches ? []}:
3
4
with stdenv.lib;
5
6
-
stdenv.mkDerivation rec {
7
-
name = "st-0.6";
8
-
0
9
src = fetchurl {
10
url = "http://dl.suckless.org/st/${name}.tar.gz";
11
-
sha256 = "0avsfc1qp8zvshsfjwwrkvk411jlqy58z225bsdhjkl1qc40qcc5";
12
};
13
14
-
inherit patches;
15
16
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
17
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
18
-
19
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
20
21
-
NIX_LDFLAGS = "-lfontconfig";
22
-
23
installPhase = ''
24
TERMINFO=$out/share/terminfo make install PREFIX=$out
25
'';
26
-
27
meta = {
28
homepage = http://st.suckless.org/;
29
license = stdenv.lib.licenses.mit;
30
-
maintainers = with maintainers; [viric];
31
platforms = platforms.linux;
32
};
33
}
···
1
+
{ stdenv, fetchurl, pkgconfig, writeText, libX11, ncurses, libXext, libXft
2
+
, fontconfig, conf ? null, patches ? []}:
3
4
with stdenv.lib;
5
6
+
let patches' = if isNull patches then [] else patches;
7
+
in stdenv.mkDerivation rec {
8
+
name = "st-0.7";
9
+
10
src = fetchurl {
11
url = "http://dl.suckless.org/st/${name}.tar.gz";
12
+
sha256 = "f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000";
13
};
14
15
+
patches = patches' ++ [ ./st-fix-deletekey.patch ];
16
17
configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
18
preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
19
+
20
buildInputs = [ pkgconfig libX11 ncurses libXext libXft fontconfig ];
21
0
0
22
installPhase = ''
23
TERMINFO=$out/share/terminfo make install PREFIX=$out
24
'';
25
+
26
meta = {
27
homepage = http://st.suckless.org/;
28
license = stdenv.lib.licenses.mit;
29
+
maintainers = with maintainers; [viric andsild];
30
platforms = platforms.linux;
31
};
32
}
+15
pkgs/applications/misc/st/st-fix-deletekey.patch
···
0
0
0
0
0
0
0
0
0
0
0
0
0
0
0
···
1
+
diff --git a/config.def.h b/config.def.h
2
+
index 1896246..b41747f 100644
3
+
--- a/config.def.h
4
+
+++ b/config.def.h
5
+
@@ -315,8 +315,8 @@ static Key key[] = {
6
+
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
7
+
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
8
+
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
9
+
- { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
10
+
- { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
11
+
+ { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0},
12
+
+ { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0},
13
+
{ XK_BackSpace, XK_NO_MOD, "\177", 0, 0, 0},
14
+
{ XK_BackSpace, Mod1Mask, "\033\177", 0, 0, 0},
15
+
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},