public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xlockmore: update from 5.43 to 5.44, fix appdefaultdir and meta information

Browse Source
This commit is contained in:
Pascal Wittmann 2014-11-10 12:46:36 +01:00
parent 7244de4a4a
commit accb8d2c55
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/misc/screensavers/xlockmore/default.nix
View File

@ -2,23 +2,20 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xlockmore-5.43"; name = "xlockmore-5.44";
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 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; sha256 = "07bxl2k84jzz2zn364jakd1sg8rlhynkb7pchb19wy785ssgwvfi";
}; };
# Optionally, it can use GTK+. # Optionally, it can use GTK+.
buildInputs = [ pam x11 ]; buildInputs = [ pam x11 ];
# The `xlock' program needs to be linked against Glibc's
# `libgcrypt', which contains `crypt(3)'.
patches = [ ./makefile-libcrypt.patch ];
# Don't try to install `xlock' setuid. Password authentication works # Don't try to install `xlock' setuid. Password authentication works
# fine via PAM without super user privileges. # fine via PAM without super user privileges.
configureFlags = configureFlags =
" --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value " --with-crypt"
+ " --enable-appdefaultdir=$out/share/X11/app-defaults"
+ " --disable-setuid" + " --disable-setuid"
+ " --without-editres" + " --without-editres"
+ " --without-xpm" + " --without-xpm"
@ -38,9 +35,15 @@ stdenv.mkDerivation rec {
+ " --without-gtk" + " --without-gtk"
+ (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam"); + (if pam != null then " --enable-pam --enable-bad-pam" else " --disable-pam");
meta = { preConfigure = ''
configureFlags+=" --enable-appdefaultdir=$out/share/X11/app-defaults"
'';
meta = with stdenv.lib; {
description = "Screen locker for the X Window System"; description = "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 = licenses.gpl2;
maintainers = with maintainers; [ pSub ];
platforms = platforms.linux;
}; };
} }