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

xlock: fixed build and updated to version 5.24

Browse source 
svn path=/nixpkgs/trunk/; revision=17356
This commit is contained in:
Peter Simons 2009-09-22 20:16:38 +00:00
parent 8a9c1f6781
commit 04558d8496
2 changed files with 57 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/misc/screensavers/xlockmore/default.nix
View file

@ -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! # FIXME: Password authentication doesn't work!
name = "xlockmore-5.24"; name = "xlockmore-5.29";
src = fetchurl { src = fetchurl {
url = http://www.tux.org/~bagleyd/xlock/xlockmore-5.24.tar.bz2; url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2";
sha256 = "dbee7bbe35c08afcbe419603fae60aee7898bbd85a3175dc788f02ddbb9f5a39"; sha256 = "47700f74cdd6ada80717358fd9cbb4316a0b2350fd527cfcd1e9b018d3818db2";
}; };
# Optionally, it can use GTK+ as well. # Optionally, it can use GTK+ as well.
@ -19,8 +19,25 @@ stdenv.mkDerivation {
# Don't try to install `xlock' setuid. Instead, the user should add # Don't try to install `xlock' setuid. Instead, the user should add
# it to `security.extraSetuidPrograms'. # it to `security.extraSetuidPrograms'.
configureFlags = configureFlags =
"--disable-setuid --enable-pam --enable-bad-pam " + + " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value
"--enable-appdefaultdir=$out/lib/X11/app-defaults"; + " --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 = { meta = {
description = "Xlockmore, a screen locker for the X Window System."; description = "Xlockmore, a screen locker for the X Window System.";

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

@ -8401,7 +8401,8 @@ let
}; };
xlockmore = import ../misc/screensavers/xlockmore { xlockmore = import ../misc/screensavers/xlockmore {
inherit fetchurl stdenv pam x11 freetype; inherit fetchurl stdenv x11 freetype;
pam = if getPkgConfig "xlockmore" "pam" true then pam else null;
}; };
saneBackends = import ../misc/sane-backends { saneBackends = import ../misc/sane-backends {