git.iko.soy/typeable/nixpkgs
on master help sign in
dmenu: 4.9 -> 5.0
commitf6464bcad1e68c3cc6c7b96f358dcf8a3d3ce183 authorAlvar Penning <post@0x21.biz> dateSat 19 Sep 2020, 11:48 (6 years ago) parent72b0046
2 files changed+3−34
pkgs/applications/misc/dmenu/default.nix+3−3 pkgs/applications/misc/dmenu/xim.patch−31
pkgs/applications/misc/dmenu/default.nix+3−3
@@ -1,11 +1,11 @@
1−{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }:
1+{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
22
33stdenv.mkDerivation rec {
4− name = "dmenu-4.9";
4+ name = "dmenu-5.0";
55
66 src = fetchurl {
77 url = "https://dl.suckless.org/tools/${name}.tar.gz";
8− sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk";
8+ sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y";
99 };
1010
1111 buildInputs = [ libX11 libXinerama zlib libXft ];
pkgs/applications/misc/dmenu/xim.patchdeleted−31
@@ -1,31 +0,0 @@
1−Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html
2−
3−Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html
4−--- a/dmenu.c
5−+++ b/dmenu.c
6−@@ -552,7 +552,7 @@ run(void)
7− XEvent ev;
8−
9− while (!XNextEvent(dpy, &ev)) {
10−- if (XFilterEvent(&ev, None))
11−+ if (XFilterEvent(&ev, win))
12− continue;
13− switch(ev.type) {
14− case Expose:
15−@@ -664,7 +664,6 @@ setup(void)
16− XNClientWindow, win, XNFocusWindow, win, NULL);
17−
18− XMapRaised(dpy, win);
19−- XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
20− if (embed) {
21− XSelectInput(dpy, parentwin, FocusChangeMask);
22− if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
23−@@ -730,8 +729,6 @@ main(int argc, char *argv[])
24−
25− if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
26− fputs("warning: no locale support\n", stderr);
27−- if (!XSetLocaleModifiers(""))
28−- fputs("warning: no locale modifiers support\n", stderr);
29− if (!(dpy = XOpenDisplay(NULL)))
30− die("cannot open display");
31− screen = DefaultScreen(dpy);