diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-04-11 23:31:33 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-04-11 23:31:33 +0200 |
| commit | 8249695b618204efe142e2de9db289f989d270ad (patch) | |
| tree | dad41af95ba4d16bc6640503d003d36d9e1debf2 /pkgs/applications/window-managers | |
| parent | 7d9607f1511bfe496fcd77ef735e7fc7f1c6eb9f (diff) | |
| parent | 6640000cb7148ba39bbdcca8e0cd7f5c224bce57 (diff) | |
| download | nixlib-8249695b618204efe142e2de9db289f989d270ad.tar nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.gz nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.bz2 nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.lz nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.xz nixlib-8249695b618204efe142e2de9db289f989d270ad.tar.zst nixlib-8249695b618204efe142e2de9db289f989d270ad.zip | |
Merge branch 'master' into x-updates
Needed that to fix the tarball.
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 | 7 |
2 files changed, 41 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/dwm/confnotify-6.0.patch b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch new file mode 100644 index 000000000000..5b5e2ebb68a7 --- /dev/null +++ b/pkgs/applications/window-managers/dwm/confnotify-6.0.patch @@ -0,0 +1,36 @@ +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 db4692683507..82eb9e56935f 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -1,7 +1,10 @@ {stdenv, fetchurl, libX11, libXinerama, patches ? []}: -stdenv.mkDerivation rec { +let name = "dwm-6.0"; +in +stdenv.mkDerivation { + inherit name; src = fetchurl { url = "http://dl.suckless.org/dwm/${name}.tar.gz"; @@ -13,7 +16,7 @@ stdenv.mkDerivation rec { prePatch = ''sed -i "s@/usr/local@$out@" config.mk''; # Allow users set their own list of patches - inherit patches; + patches = [ ./confnotify-6.0.patch ] ++ patches; buildPhase = " make "; |