From bbe5e97f1b4b623989d019f6eef1b7a9d5f06fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 16 Dec 2018 08:49:48 +0000 Subject: [PATCH] xsecurelock: 1.1 -> 1.2 --- pkgs/tools/X11/xsecurelock/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 88e36bfde39c..738b9d3dcea9 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,16 +4,18 @@ stdenv.mkDerivation rec { name = "xsecurelock-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "0yqp5xhkl9jpjyrmrxbyp7azwxmqc3lxv5lxrjqjaapl3q3096g5"; + sha256 = "1vaw2m3yyfazj1x7xdwppmm0ch075q399g5vzrmhhrkzdrs53r1x"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook pkgconfig + ]; buildInputs = [ libX11 libXcomposite libXft libXmu pam apacheHttpd imagemagick pamtester @@ -24,6 +26,12 @@ stdenv.mkDerivation rec { "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver" ]; + preConfigure = '' + cat > version.c <<'EOF' + const char *const git_version = "${version}"; + EOF + ''; + preInstall = '' substituteInPlace helpers/saver_blank \ --replace 'protect xset' 'protect ${xset}/bin/xset'