alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

slim: Really update to 1.3.4

Browse source
This commit is contained in:
Eelco Dolstra 2012-08-17 11:33:37 -04:00
parent 4c3c452e7f
commit 1e4c4b70b1
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,39 +1,33 @@
{stdenv, fetchurl, x11, libjpeg, libpng12, libXmu, freetype, pam}:
{ stdenv, fetchurl, cmake, pkgconfig, x11, libjpeg, libpng12, libXmu
, fontconfig, freetype, pam, consolekit, dbus_libs }:
stdenv.mkDerivation rec {
name = "slim-1.3.2";
name = "slim-1.3.4";
src = fetchurl {
url = "http://download.berlios.de/slim/${name}.tar.gz";
sha256 = "1f42skdp5k1zrb364s3i0ps5wmx9szz9h192i2dkn9az00jh2mpi";
sha256 = "00fmrg2v41jnqhx0yc1kv97xxh5gai18n0i4as9g1fcq1i32cp0m";
};
patches = [
# Allow the paths of the configuration file and theme directory to
# be set at runtime.
./runtime-paths.patch
# Fix a bug in slim's PAM support: the "resp" argument to the
# conversation function is a pointer to a pointer to an array of
# pam_response structures, not a pointer to an array of pointers to
# pam_response structures. Of course C can't tell the difference...
./pam.patch
# Don't set PAM_RHOST to "localhost", it confuses ConsoleKit
# (which assumes that a non-empty string means a remote session).
./pam2.patch
];
buildInputs = [x11 libjpeg libpng12 libXmu freetype pam];
buildInputs =
[ cmake pkgconfig x11 libjpeg libpng12 libXmu fontconfig freetype
pam dbus_libs
] ++ stdenv.lib.optional (consolekit != null) consolekit;
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
preBuild = ''
substituteInPlace Makefile --replace /usr /no-such-path
makeFlagsArray=(CC=gcc CXX=g++ PREFIX=$out MANDIR=$out/share/man CFGDIR=$out/etc USE_PAM=1)
'';
cmakeFlags = [ "-DUSE_PAM=1" ] ++ stdenv.lib.optional (consolekit != null) "-DUSE_CONSOLEKIT=1";
NIX_CFLAGS_LINK = "-lXmu";
meta = {
homepage = http://slim.berlios.de;
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/top-level/all-packages.nix
View file

@ -7520,7 +7520,9 @@ let
dropbox = callPackage ../applications/networking/dropbox { };
slim = callPackage ../applications/display-managers/slim { };
slim = callPackage ../applications/display-managers/slim {
consolekit = null;
};
sndBase = builderDefsPackage (import ../applications/audio/snd) {
inherit fetchurl stdenv stringsWithDeps lib fftw;