diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-12-16 15:19:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-16 15:19:08 +0000 |
commit | b90e52ea552e3076adc619dabf46158992ade65c (patch) | |
tree | 9a47a1ed5dfc6559a0615a44bda380f4439726a9 /pkgs/tools | |
parent | 1aa2c5a8a849da1f4fa9e5778637dc0dbdac6a78 (diff) | |
parent | bbe5e97f1b4b623989d019f6eef1b7a9d5f06fcd (diff) | |
download | nixlib-b90e52ea552e3076adc619dabf46158992ade65c.tar nixlib-b90e52ea552e3076adc619dabf46158992ade65c.tar.gz nixlib-b90e52ea552e3076adc619dabf46158992ade65c.tar.bz2 nixlib-b90e52ea552e3076adc619dabf46158992ade65c.tar.lz nixlib-b90e52ea552e3076adc619dabf46158992ade65c.tar.xz nixlib-b90e52ea552e3076adc619dabf46158992ade65c.tar.zst nixlib-b90e52ea552e3076adc619dabf46158992ade65c.zip |
Merge pull request #52329 from Mic92/xsecurelock
xsecurelock: 1.1 -> 1.2
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/X11/xsecurelock/default.nix | 14 |
1 files 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' |