alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

xsecurelock: hardcode path to xset

Browse source 
(cherry picked from commit c04e6e04e2)
This commit is contained in:
Franz Pletz 2018-10-11 02:06:16 +02:00
parent 85b269a5d5
commit 97ba5aac8d
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/X11/xsecurelock/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick
, pamtester, xscreensaver }:
, pamtester, xscreensaver, xset }:
stdenv.mkDerivation rec {
name = "xsecurelock-${version}";
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
"--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
];
preInstall = ''
substituteInPlace helpers/saver_blank \
--replace 'protect xset' 'protect ${xset}/bin/xset'
'';
meta = with lib; {
description = "X11 screen lock utility with security in mind";
homepage = https://github.com/google/xsecurelock;

4
pkgs/top-level/all-packages.nix
View file

@ -6135,7 +6135,9 @@ with pkgs;
libxml2 = libxml2Python;
};
xsecurelock = callPackage ../tools/X11/xsecurelock { };
xsecurelock = callPackage ../tools/X11/xsecurelock {
xset = xorg.xset;
};
xsel = callPackage ../tools/misc/xsel { };