diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-14 10:15:48 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-14 10:15:48 +0000 |
| commit | 5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982 (patch) | |
| tree | 9fd517a8756b8adecd31351ee35e6a33bac57da8 /pkgs | |
| parent | 1566609a1ac00a7112dc87f46ff7f14c28ba1931 (diff) | |
| download | nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.tar nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.tar.gz nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.tar.bz2 nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.tar.lz nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.tar.xz nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.tar.zst nixlib-5f85d4c19c7e2e944b3c4f67235f8ad5fdb98982.zip | |
* slim: update to 1.3.2.
svn path=/nixpkgs/branches/x-updates/; revision=25951
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/display-managers/slim/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch | 17 |
2 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index b00fb6d2dc7b..2ea53fd4e55a 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}: stdenv.mkDerivation rec { - name = "slim-1.3.1"; + name = "slim-1.3.2"; src = fetchurl { url = "http://download.berlios.de/slim/${name}.tar.gz"; - sha256 = "0xqgzvg6h1bd29140mcgg9r16vcmskz7zmym7i7jlz7x9c1a9mxc"; + sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi"; }; patches = [ @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit # (which assumes that a non-empty string means a remote session). ./pam2.patch - - ./slim-1.3.1-gcc4.4.patch ]; buildInputs = [x11 libjpeg libpng libXmu freetype pam]; diff --git a/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch b/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch deleted file mode 100644 index 71b028ec080b..000000000000 --- a/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch to allow compilation with gcc-4.4 - -Notified by Daniel J. - from Debian bug tracker - -http://bugs.gentoo.org/252745 - ---- a/switchuser.h 2008-11-11 19:40:18.000000000 +0000 -+++ a/switchuser.h 2008-11-11 19:40:28.000000000 +0000 -@@ -18,6 +18,7 @@ - #include <pwd.h> - #include <grp.h> - #include <paths.h> -+#include <cstdio> - #include <iostream> - #include "const.h" - #include "cfg.h" - |