diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2019-09-06 03:20:09 +0200 |
| commit | cdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (patch) | |
| tree | 3fdd8ed1c086fb0ddf93941114bb1cbbb4659af9 /pkgs/misc/screensavers | |
| parent | e7cccdbb139ccf2f9f170500f40c04a6237a2da1 (diff) | |
| parent | ed54a5b51dc9542df94f70b25a13d86d1f494e64 (diff) | |
Merge branch 'master' into staging-next
Fixed trivial conflicts caused by removing rec.
Diffstat (limited to 'pkgs/misc/screensavers')
| -rw-r--r-- | pkgs/misc/screensavers/xlockmore/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index c3cfbaf23b3f..c08b16a0a1d3 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { curlOpts = "--user-agent 'Mozilla/5.0'"; }; - # Optionally, it can use GTK+. + # Optionally, it can use GTK. buildInputs = [ pam libX11 libXext libXinerama libXdmcp libXt ]; # Don't try to install `xlock' setuid. Password authentication works |