pyrox.dev
Merge pull request #212515 from NickCao/wayvnc
wayvnc: 0.5.0 -> 0.6.1, enable checks
+48
-7
pkgs/applications/networking/remote/wayvnc/default.nix
+48
-7
pkgs/applications/networking/remote/wayvnc/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner
2
-
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, meson
5
+
, ninja
6
+
, pkg-config
7
+
, scdoc
8
+
, wayland-scanner
9
+
, aml
10
+
, jansson
11
+
, libxkbcommon
12
+
, mesa
13
+
, neatvnc
14
+
, pam
15
+
, pixman
16
+
, wayland
3
17
}:
4
18
5
19
stdenv.mkDerivation rec {
6
20
pname = "wayvnc";
7
-
version = "0.5.0";
21
+
version = "0.6.1";
8
22
9
23
src = fetchFromGitHub {
10
24
owner = "any1";
11
25
repo = pname;
12
26
rev = "v${version}";
13
-
sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4=";
27
+
sha256 = "sha256-WKtflN6DyzumOMEx+iX0AoIyGRN4nXUckmW/9Z2EW+Q=";
14
28
};
15
29
16
-
depsBuildBuild = [ pkg-config ];
17
-
nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ];
18
-
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ];
30
+
strictDeps = true;
31
+
32
+
depsBuildBuild = [
33
+
pkg-config
34
+
];
35
+
36
+
nativeBuildInputs = [
37
+
meson
38
+
ninja
39
+
pkg-config
40
+
scdoc
41
+
wayland-scanner
42
+
];
43
+
44
+
buildInputs = [
45
+
aml
46
+
jansson
47
+
libxkbcommon
48
+
mesa
49
+
neatvnc
50
+
pam
51
+
pixman
52
+
wayland
53
+
];
54
+
55
+
mesonFlags = [
56
+
(lib.mesonBool "tests" true)
57
+
];
58
+
59
+
doCheck = true;
19
60
20
61
meta = with lib; {
21
62
description = "A VNC server for wlroots based Wayland compositors";
+2
-2
pkgs/development/libraries/aml/default.nix
+2
-2
pkgs/development/libraries/aml/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "aml";
5
-
version = "0.2.2";
5
+
version = "0.3.0";
6
6
7
7
src = fetchFromGitHub {
8
8
owner = "any1";
9
9
repo = pname;
10
10
rev = "v${version}";
11
-
sha256 = "sha256-WhhjK9uzKyvnzpGtAWXXo0upfZTPINHVk0qmzNXwobE=";
11
+
sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q=";
12
12
};
13
13
14
14
nativeBuildInputs = [ meson pkg-config ninja ];
+38
-6
pkgs/development/libraries/neatvnc/default.nix
+38
-6
pkgs/development/libraries/neatvnc/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja
2
-
, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg
1
+
{ lib
2
+
, stdenv
3
+
, fetchFromGitHub
4
+
, meson
5
+
, ninja
6
+
, pkg-config
7
+
, aml
8
+
, ffmpeg
9
+
, gnutls
10
+
, libjpeg_turbo
11
+
, mesa
12
+
, pixman
13
+
, zlib
3
14
}:
4
15
5
16
stdenv.mkDerivation rec {
6
17
pname = "neatvnc";
7
-
version = "0.5.4";
18
+
version = "0.6.0";
8
19
9
20
src = fetchFromGitHub {
10
21
owner = "any1";
11
22
repo = pname;
12
23
rev = "v${version}";
13
-
sha256 = "sha256-IZUCNHhlDhq0KlUjkp3Yh5ysJsThlGw1FLHSaFe4Z0Q=";
24
+
sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4=";
14
25
};
15
26
16
-
nativeBuildInputs = [ meson pkg-config ninja ];
17
-
buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ];
27
+
strictDeps = true;
28
+
29
+
nativeBuildInputs = [
30
+
meson
31
+
ninja
32
+
pkg-config
33
+
];
34
+
35
+
buildInputs = [
36
+
aml
37
+
ffmpeg
38
+
gnutls
39
+
libjpeg_turbo
40
+
mesa
41
+
pixman
42
+
zlib
43
+
];
44
+
45
+
mesonFlags = [
46
+
(lib.mesonBool "tests" true)
47
+
];
48
+
49
+
doCheck = true;
18
50
19
51
meta = with lib; {
20
52
description = "A VNC server library";