diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-01-02 11:53:25 +0100 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-01-02 11:53:25 +0100 |
commit | fc2580ad877c94aa603e78f640be3e0229fd0e60 (patch) | |
tree | d63f3be132bacd5daa73158d474dcc5f52629903 /pkgs/applications/window-managers | |
parent | fd343dc0c6a738df4e8faba1924c7c199e57737b (diff) | |
download | nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.tar nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.tar.gz nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.tar.bz2 nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.tar.lz nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.tar.xz nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.tar.zst nixlib-fc2580ad877c94aa603e78f640be3e0229fd0e60.zip |
Removed confnotify-6.0.patch.
I don't think it is a good idea to hardcode this patch in nixpkgs as it is likely that a patch provided by a user will conflict with this patch. This is for instance the case with the patch "single_tagset" (http://dwm.suckless.org/patches/single_tagset).
Diffstat (limited to 'pkgs/applications/window-managers')
-rw-r--r-- | pkgs/applications/window-managers/dwm/confnotify-6.0.patch | 36 | ||||
-rw-r--r-- | pkgs/applications/window-managers/dwm/default.nix | 2 |
2 files changed, 1 insertions, 37 deletions
diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch deleted file mode 100644 index 5b5e2ebb68a7..000000000000 --- a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix SDL fullscreen problems when the resolution changes: -https://groups.google.com/d/msg/wmii/nJBrSjrnnq8/ZEYWOWE5pj4J - -diff -r ec4baab78314 dwm.c ---- a/dwm.c Mon Dec 19 15:38:30 2011 +0100 -+++ b/dwm.c Sat Jan 14 12:35:50 2012 +0100 -@@ -397,9 +397,10 @@ - showhide(m->stack); - else for(m = mons; m; m = m->next) - showhide(m->stack); -- if(m) -+ if(m) { - arrangemon(m); -- else for(m = mons; m; m = m->next) -+ restack(m); -+ } else for(m = mons; m; m = m->next) - arrangemon(m); - } - -@@ -408,7 +409,6 @@ - strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol); - if(m->lt[m->sellt]->arrange) - m->lt[m->sellt]->arrange(m); -- restack(m); - } - - void -@@ -1827,6 +1827,8 @@ - .event_mask = ButtonPressMask|ExposureMask - }; - for(m = mons; m; m = m->next) { -+ if (m->barwin) -+ continue; - m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), - CopyFromParent, DefaultVisual(dpy, screen), - CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index 82eb9e56935f..b69dd9d8a492 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches - patches = [ ./confnotify-6.0.patch ] ++ patches; + inherit patches; buildPhase = " make "; |