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

xsecurelock: hardcode path to xset

Browse Source
This commit is contained in:
Franz Pletz 2018-10-11 02:06:16 +02:00
parent cf440dae56
commit c04e6e04e2
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 { lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
, libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick , libX11, libXcomposite, libXft, libXmu, pam, apacheHttpd, imagemagick
, pamtester, xscreensaver }: , pamtester, xscreensaver, xset }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xsecurelock-${version}"; name = "xsecurelock-${version}";
@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
"--with-xscreensaver=${xscreensaver}/libexec/xscreensaver" "--with-xscreensaver=${xscreensaver}/libexec/xscreensaver"
]; ];
preInstall = ''
substituteInPlace helpers/saver_blank \
--replace 'protect xset' 'protect ${xset}/bin/xset'
'';
meta = with lib; { meta = with lib; {
description = "X11 screen lock utility with security in mind"; description = "X11 screen lock utility with security in mind";
homepage = https://github.com/google/xsecurelock; homepage = https://github.com/google/xsecurelock;

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

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