diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2020-11-24 10:31:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 10:31:30 +0100 |
| commit | 4c4de466650cc9c0536c08928c1a5cbb903e4244 (patch) | |
| tree | d53b5bb44a3981a22ec58af07ea8cbf6a9324ed9 /pkgs | |
| parent | 99947385e5655b77954a7cf0538ca3f6184322bb (diff) | |
| parent | f6464bcad1e68c3cc6c7b96f358dcf8a3d3ce183 (diff) | |
Merge pull request #98267 from oxzi/dmenu-5.0
dmenu: 4.9 -> 5.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/misc/dmenu/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/misc/dmenu/xim.patch | 31 |
2 files changed, 3 insertions, 34 deletions
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index e4d0c82c4176..f83c5fc7f01f 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? [ ./xim.patch ] }: +{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }: stdenv.mkDerivation rec { - name = "dmenu-4.9"; + name = "dmenu-5.0"; src = fetchurl { url = "https://dl.suckless.org/tools/${name}.tar.gz"; - sha256 = "0ia9nqr83bv6x247q30bal0v42chcj9qcjgv59xs6xj46m7iz5xk"; + sha256 = "1lvfxzg3chsgcqbc2vr0zic7vimijgmbvnspayx73kyvqi1f267y"; }; buildInputs = [ libX11 libXinerama zlib libXft ]; diff --git a/pkgs/applications/misc/dmenu/xim.patch b/pkgs/applications/misc/dmenu/xim.patch deleted file mode 100644 index f77d48324da4..000000000000 --- a/pkgs/applications/misc/dmenu/xim.patch +++ /dev/null @@ -1,31 +0,0 @@ -Revert https://git.suckless.org/dmenu/commit/377bd37e212b1ec4c03a481245603c6560d0be22.html - -Upstream has reverted it after v4.9 in https://git.suckless.org/dmenu/commit/db6093f6ec1bb884f7540f2512935b5254750b30.html ---- a/dmenu.c -+++ b/dmenu.c -@@ -552,7 +552,7 @@ run(void) - XEvent ev; - - while (!XNextEvent(dpy, &ev)) { -- if (XFilterEvent(&ev, None)) -+ if (XFilterEvent(&ev, win)) - continue; - switch(ev.type) { - case Expose: -@@ -664,7 +664,6 @@ setup(void) - XNClientWindow, win, XNFocusWindow, win, NULL); - - XMapRaised(dpy, win); -- XSetInputFocus(dpy, win, RevertToParent, CurrentTime); - if (embed) { - XSelectInput(dpy, parentwin, FocusChangeMask); - if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) { -@@ -730,8 +729,6 @@ main(int argc, char *argv[]) - - if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fputs("warning: no locale support\n", stderr); -- if (!XSetLocaleModifiers("")) -- fputs("warning: no locale modifiers support\n", stderr); - if (!(dpy = XOpenDisplay(NULL))) - die("cannot open display"); - screen = DefaultScreen(dpy); |