diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-16 15:02:46 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-01-16 15:02:46 +0000 |
| commit | 659a9a835a13c13dc4a8a40369e8a961ac53ebee (patch) | |
| tree | 127083a741e9b6e789d9ed0844c91ad0a28dca0e /pkgs/applications/display-managers | |
| parent | be72ec22e0ae2ee68f66b5cb31208717a68c48e5 (diff) | |
| download | nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.tar nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.tar.gz nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.tar.bz2 nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.tar.lz nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.tar.xz nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.tar.zst nixpkgs-659a9a835a13c13dc4a8a40369e8a961ac53ebee.zip | |
Fixing the slim build in gcc 4.4
svn path=/nixpkgs/branches/stdenv-updates/; revision=19482
Diffstat (limited to 'pkgs/applications/display-managers')
| -rw-r--r-- | pkgs/applications/display-managers/slim/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 0cd866a2c95..b00fb6d2dc7 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -22,6 +22,8 @@ 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 new file mode 100644 index 00000000000..71b028ec080 --- /dev/null +++ b/pkgs/applications/display-managers/slim/slim-1.3.1-gcc4.4.patch @@ -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" + |