diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-08-14 00:02:54 +0000 |
commit | f9abd30e11337cf07034f2cc8ad1691aa4a69386 (patch) | |
tree | c3b5c34b1c533f5c231dc6707e96795fb3a9a138 /nixpkgs/pkgs/misc/screensavers | |
parent | 44e04ea2730f8e3b863b81b0056babe233c244f6 (diff) | |
parent | 1036dc664169b32613ec11b58cc1740c7511a340 (diff) | |
download | nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.gz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.bz2 nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.lz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.xz nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.tar.zst nixlib-f9abd30e11337cf07034f2cc8ad1691aa4a69386.zip |
Merge commit '1036dc664169b32613ec11b58cc1740c7511a340'
Diffstat (limited to 'nixpkgs/pkgs/misc/screensavers')
-rw-r--r-- | nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix | 10 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index ffa8934cd8bb..cd5db3067f41 100644 --- a/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -1,6 +1,6 @@ { stdenv, makeWrapper, fetchFromGitHub, - imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh + imagemagick, i3lock-color, xdpyinfo, xrandr, bc, feh, procps, xrdb }: stdenv.mkDerivation rec { @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { patches = [ ./replace-i3lock.patch ]; - installPhase = - let - PATH = + installPhase = + let + PATH = stdenv.lib.makeBinPath - [imagemagick i3lock-color xdpyinfo xrandr bc feh]; + [imagemagick i3lock-color xdpyinfo xrandr bc feh procps xrdb]; in '' mkdir -p $out/bin cp betterlockscreen $out/bin/betterlockscreen diff --git a/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index 6a9dfaef497a..3edfa9553d6d 100644 --- a/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.40"; - name = "xscreensaver-${version}"; + version = "5.43"; + pname = "xscreensaver"; src = fetchurl { - url = "https://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "1q2sr7h6ps6d3hk8895g12rrcqiihjl7py1ly077ikv4866r181h"; + url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1m43nfcpagv03zwlivpzp82qdv590s5c8vjjn4iirqjl6mzvdshp"; }; buildInputs = |