diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:20 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-13 09:48:20 +0200 |
commit | 6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204 (patch) | |
tree | b55f27e4cc46982ebddabf4935268e4ea38610c9 /pkgs/tools/X11 | |
parent | ef93155f60284e7cd694ded81bd15f07997575bc (diff) | |
parent | 35ce480d69778867c1de820188879bbad6bc2f75 (diff) | |
download | nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.gz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.bz2 nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.lz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.xz nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.tar.zst nixlib-6f5142e48ef1b6c66ebf46ae9ddaf372dc34b204.zip |
Merge master into staging
Diffstat (limited to 'pkgs/tools/X11')
-rw-r--r-- | pkgs/tools/X11/xdg-utils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xpra/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/X11/xsecurelock/default.nix | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index d8ae32c6ee4c..44016b801e5d 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -17,11 +17,11 @@ in stdenv.mkDerivation rec { name = "xdg-utils-${version}"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "https://portland.freedesktop.org/download/${name}.tar.gz"; - sha256 = "1k4b4m3aiyqn9k12a0ihcdahzlspl3zhskmm1d7228dvqvi546cm"; + sha256 = "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p"; }; # just needed when built from git diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 915144daa908..3e4d49108b71 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -14,11 +14,11 @@ let xf86videodummy = callPackage ./xf86videodummy { }; in buildPythonApplication rec { pname = "xpra"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "1azvvddjfq7lb5kmbn0ilgq2nf7pmymsc3b9lhbjld6w156qdv01"; + sha256 = "0wa3kx54himy3i1b2801hlzfilh3cf4kjk40k1cjl0ds28m5hija"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 4ee51100b339..88e36bfde39c 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -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; |