diff options
| author | Kaiden Fey <kookie@spacekookie.de> | 2020-09-19 15:00:33 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-09-19 15:00:33 +0200 |
| commit | e0800985dab8f8ebb4cebdfd7e361fd1fafdb2a7 (patch) | |
| tree | 289f43c72dd1fffeec4eb18ced05ae91e50c179a /nixpkgs/pkgs/misc/screensavers | |
| parent | 5581b5521e14317c3507a6e8451a3f14996e5c4d (diff) | |
| parent | 441a7da8080352881bb52f85e910d8855e83fc55 (diff) | |
Merge commit '441a7da8080352881bb52f85e910d8855e83fc55'
Diffstat (limited to 'nixpkgs/pkgs/misc/screensavers')
| -rw-r--r-- | nixpkgs/pkgs/misc/screensavers/pipes/default.nix | 7 | ||||
| -rw-r--r-- | nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix index 211b7614f3b..94d6299d383 100644 --- a/nixpkgs/pkgs/misc/screensavers/pipes/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/pipes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgs }: +{ stdenv, fetchurl, makeWrapper, coreutils, ncurses }: stdenv.mkDerivation rec { pname = "pipes"; @@ -9,11 +9,14 @@ stdenv.mkDerivation rec { sha256 = "09m4alb3clp3rhnqga5v6070p7n1gmnwp2ssqhq87nf2ipfpcaak"; }; - buildInputs = with pkgs; [ bash ]; + buildInputs = [ makeWrapper ]; installPhase = '' mkdir $out -p make PREFIX=$out/ install + + wrapProgram $out/bin/pipes.sh \ + --set PATH "${stdenv.lib.makeBinPath [ coreutils ncurses ]}" ''; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index 01ee818f256..b59ed85f6bc 100644 --- a/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.64"; + name = "xlockmore-5.65"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0fbh6avdzsm1prafglr2xdd8c4ibkddi6xxywvqgvzp0zb2kqimr"; + sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; |