diff options
author | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-11-10 12:46:36 +0100 |
---|---|---|
committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2014-11-10 12:46:53 +0100 |
commit | accb8d2c55527851c1ab5ee47328e886a82174ed (patch) | |
tree | 333695aedaf421e6d60737462575ed6843e4c2fd /pkgs/misc/screensavers/xlockmore | |
parent | 7244de4a4a0e9ef9ca2013e1148fa87613a15cb1 (diff) | |
download | nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.tar nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.tar.gz nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.tar.bz2 nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.tar.lz nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.tar.xz nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.tar.zst nixpkgs-accb8d2c55527851c1ab5ee47328e886a82174ed.zip |
xlockmore: update from 5.43 to 5.44, fix appdefaultdir and meta information
Diffstat (limited to 'pkgs/misc/screensavers/xlockmore')
-rw-r--r-- | pkgs/misc/screensavers/xlockmore/default.nix | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 7e750d9c9b3..f06eab3a29a 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,23 +2,20 @@ stdenv.mkDerivation rec { - name = "xlockmore-5.43"; + name = "xlockmore-5.44"; src = fetchurl { url = "http://www.tux.org/~bagleyd/xlock/${name}/${name}.tar.bz2"; - sha256 = "1l36n8x51j7lwdalv6yi37cil290vzd3djjqydhsm0pnm8hiz499"; + sha256 = "07bxl2k84jzz2zn364jakd1sg8rlhynkb7pchb19wy785ssgwvfi"; }; # Optionally, it can use GTK+. 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 # fine via PAM without super user privileges. configureFlags = - " --with-crypt" # TODO: set --enable-appdefaultdir to a suitable value + " --with-crypt" + + " --enable-appdefaultdir=$out/share/X11/app-defaults" + " --disable-setuid" + " --without-editres" + " --without-xpm" @@ -38,9 +35,15 @@ stdenv.mkDerivation rec { + " --without-gtk" + (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"; - homepage = "http://www.tux.org/~bagleyd/xlockmore.html"; - license = "GPL"; + homepage = http://www.tux.org/~bagleyd/xlockmore.html; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } |