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

Merge pull request #52329 from Mic92/xsecurelock 

xsecurelock: 1.1 -> 1.2
This commit is contained in:
Franz Pletz 2018-12-16 15:19:08 +00:00 committed by GitHub
parent 1aa2c5a8a8 bbe5e97f1b
commit b90e52ea55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/X11/xsecurelock/default.nix
View File

@ -4,16 +4,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xsecurelock-${version}"; name = "xsecurelock-${version}";
version = "1.1"; version = "1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "xsecurelock"; repo = "xsecurelock";
rev = "v${version}"; rev = "v${version}";
sha256 = "0yqp5xhkl9jpjyrmrxbyp7azwxmqc3lxv5lxrjqjaapl3q3096g5"; sha256 = "1vaw2m3yyfazj1x7xdwppmm0ch075q399g5vzrmhhrkzdrs53r1x";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [
autoreconfHook pkgconfig
];
buildInputs = [ buildInputs = [
libX11 libXcomposite libXft libXmu pam libX11 libXcomposite libXft libXmu pam
apacheHttpd imagemagick pamtester apacheHttpd imagemagick pamtester
@ -24,6 +26,12 @@ stdenv.mkDerivation rec {
"--with-xscreensaver=${xscreensaver}/libexec/xscreensaver" "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
]; ];
preConfigure = ''
cat > version.c <<'EOF'
const char *const git_version = "${version}";
EOF
'';
preInstall = '' preInstall = ''
substituteInPlace helpers/saver_blank \ substituteInPlace helpers/saver_blank \
--replace 'protect xset' 'protect ${xset}/bin/xset' --replace 'protect xset' 'protect ${xset}/bin/xset'