Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2021-01-11 13:36:42 +01:00
6904 changed files with 17629 additions and 16627 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam
}:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland ];
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ];
meta = with stdenv.lib; {
meta = with lib; {
description = "A VNC server for wlroots based Wayland compositors";
longDescription = ''
This is a VNC server for wlroots based Wayland compositors. It attaches