public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* slim: update to 1.3.2.

Browse Source 
svn path=/nixpkgs/branches/x-updates/; revision=25951
This commit is contained in:
Eelco Dolstra 2011-02-14 10:15:48 +00:00
parent 1566609a1a
commit 5f85d4c19c
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/display-managers/slim/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}: {stdenv, fetchurl, x11, libjpeg, libpng, libXmu, freetype, pam}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "slim-1.3.1"; name = "slim-1.3.2";
src = fetchurl { src = fetchurl {
url = "http://download.berlios.de/slim/${name}.tar.gz"; url = "http://download.berlios.de/slim/${name}.tar.gz";
sha256 = "0xqgzvg6h1bd29140mcgg9r16vcmskz7zmym7i7jlz7x9c1a9mxc"; sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
}; };
patches = [ patches = [
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
# Don't set PAM_RHOST to "localhost", it confuses ConsoleKit # Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
# (which assumes that a non-empty string means a remote session). # (which assumes that a non-empty string means a remote session).
./pam2.patch ./pam2.patch
./slim-1.3.1-gcc4.4.patch
]; ];
buildInputs = [x11 libjpeg libpng libXmu freetype pam]; buildInputs = [x11 libjpeg libpng libXmu freetype pam];

17
pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch
View File

@ -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"