alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

Fixing the slim build in gcc 4.4

Browse source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19482
This commit is contained in:
Lluís Batlle i Rossell 2010-01-16 15:02:46 +00:00
parent be72ec22e0
commit 659a9a835a
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/display-managers/slim/default.nix
View file

@ -22,6 +22,8 @@ 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 Normal file
View file

@ -0,0 +1,17 @@
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"