xlockmore: updated to version 5.38

svn path=/nixpkgs/trunk/; revision=33652
This commit is contained in:
Peter Simons 2012-04-06 18:56:00 +00:00
parent 6a838a4ba1
commit f04ca020f3

View File

@ -1,23 +1,22 @@
{stdenv, fetchurl, pam ? null, x11, freetype}: { stdenv, fetchurl, pam ? null, x11 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
# FIXME: Password authentication doesn't work!
name = "xlockmore-5.29"; name = "xlockmore-5.38";
src = fetchurl { src = fetchurl {
url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2";
sha256 = "47700f74cdd6ada80717358fd9cbb4316a0b2350fd527cfcd1e9b018d3818db2"; sha256 = "15x5l43zdjn881xf2m9psz9s2hvd2l8py2kzdhdh1v9m4ml20nf4";
}; };
# Optionally, it can use GTK+ as well. # Optionally, it can use GTK+.
buildInputs = [pam x11 freetype]; buildInputs = [ pam x11 ];
# The `xlock' program needs to be linked against Glibc's # The `xlock' program needs to be linked against Glibc's
# `libgcrypt', which contains `crypt(3)'. # `libgcrypt', which contains `crypt(3)'.
patches = [ ./makefile-libcrypt.patch ]; patches = [ ./makefile-libcrypt.patch ];
# Don't try to install `xlock' setuid. Instead, the user should add # Don't try to install `xlock' setuid. Password authentication works
# it to `security.extraSetuidPrograms'. # fine via PAM without super user privileges.
configureFlags = configureFlags =
" --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value
+ " --disable-setuid" + " --disable-setuid"
@ -41,7 +40,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Xlockmore, a screen locker for the X Window System."; description = "Xlockmore, a screen locker for the X Window System.";
homepage = http://www.tux.org/~bagleyd/xlockmore.html; homepage = "http://www.tux.org/~bagleyd/xlockmore.html";
license = "GPL"; license = "GPL";
}; };
} }