diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-05 22:18:14 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-05 22:18:14 +0100 |
| commit | 16686a902276c827455d78860dd62aaa68922cd2 (patch) | |
| tree | 193ddf7c2d66f6c34b3da952c2e3d063cfdf21fb /gnu/packages/patches/slim-session.patch | |
| parent | 1d07e9316a84a47da54469d63b1825368c0db720 (diff) | |
| download | gnu-guix-16686a902276c827455d78860dd62aaa68922cd2.tar gnu-guix-16686a902276c827455d78860dd62aaa68922cd2.tar.gz | |
gnu: slim: Upgrade to 1.3.6; allow the choice of a config file at run time.
* gnu/packages/slim.scm (slim): Upgrade to 1.3.6. Add patches. Comment
out systemd-related stuff from CMakeLists.txt. Add
"-DBUILD_SHARED_LIBS=OFF" and "-DCMAKE_SKIP_BUILD_RPATH=ON" to
#:configure-flags. Adjust 'home-page' field.
* gnu/packages/patches/slim-config.patch,
gnu/packages/patches/slim-session.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
Diffstat (limited to 'gnu/packages/patches/slim-session.patch')
| -rw-r--r-- | gnu/packages/patches/slim-session.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/slim-session.patch b/gnu/packages/patches/slim-session.patch new file mode 100644 index 0000000000..b85d3f7dd0 --- /dev/null +++ b/gnu/packages/patches/slim-session.patch @@ -0,0 +1,17 @@ +Exit after the user's session has finished. This works around slim's broken +PAM session handling (see +http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663). + +Patch by Eelco Dolstra, from Nixpkgs. + +--- slim-1.3.6/app.cpp 2013-10-15 11:02:55.629263422 +0200 ++++ slim-1.3.6/app.cpp 2013-10-15 13:00:10.141210784 +0200 +@@ -816,7 +822,7 @@ + StopServer(); + RemoveLock(); + while (waitpid(-1, NULL, WNOHANG) > 0); /* Collects all dead childrens */ +- Run(); ++ exit(OK_EXIT); + } + + void App::KillAllClients(Bool top) { |