diff options
author | Peter Simons <simons@cryp.to> | 2009-09-22 20:16:38 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2009-09-22 20:16:38 +0000 |
commit | 04558d84963c1ef7147c228195be2c5c72075931 (patch) | |
tree | ba001c5982d65317dd75151c27e673abdf536347 /pkgs/misc/screensavers/xlockmore/default.nix | |
parent | 8a9c1f6781bfcc073b2d2f1f933390917492f8e9 (diff) |
xlock: fixed build and updated to version 5.24
svn path=/nixpkgs/trunk/; revision=17356
Diffstat (limited to 'pkgs/misc/screensavers/xlockmore/default.nix')
-rw-r--r-- | pkgs/misc/screensavers/xlockmore/default.nix | 33 |
1 files changed, 25 insertions, 8 deletions
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 45a18f9fc0210..699636dada4a7 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, pam, x11, freetype}: +{stdenv, fetchurl, pam ? null, x11, freetype}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { # FIXME: Password authentication doesn't work! - name = "xlockmore-5.24"; + name = "xlockmore-5.29"; src = fetchurl { - url = http://www.tux.org/~bagleyd/xlock/xlockmore-5.24.tar.bz2; - sha256 = "dbee7bbe35c08afcbe419603fae60aee7898bbd85a3175dc788f02ddbb9f5a39"; + url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; + sha256 = "47700f74cdd6ada80717358fd9cbb4316a0b2350fd527cfcd1e9b018d3818db2"; }; # Optionally, it can use GTK+ as well. @@ -18,9 +18,26 @@ stdenv.mkDerivation { # Don't try to install `xlock' setuid. Instead, the user should add # it to `security.extraSetuidPrograms'. - configureFlags = - "--disable-setuid --enable-pam --enable-bad-pam " + - "--enable-appdefaultdir=$out/lib/X11/app-defaults"; + configureFlags = + + " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value + + " --disable-setuid" + + " --without-editres" + + " --without-xpm" + + " --without-gltt" + + " --without-ttf" + + " --without-ftgl" + + " --without-freetype" + + " --without-opengl" + + " --without-mesa" + + " --without-dtsaver" + + " --without-ext" + + " --without-dpms" + + " --without-xinerama" + + " --without-rplay" + + " --without-nas" + + " --without-gtk2" + + " --without-gtk" + + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); meta = { description = "Xlockmore, a screen locker for the X Window System."; |