Merge pull request #259104 from NickCao/wayvnc

neatvnc: 0.6.0 -> 0.7.0, wayvnc: 0.6.2 -> 0.7.1
This commit is contained in:
Nick Cao 2023-10-08 10:59:11 -04:00 committed by GitHub
commit fb59e92430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions

View File

@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "wayvnc";
version = "0.6.2";
version = "0.7.1";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "sha256-yNWTTjlmMCMTed1SiRep3iUxchQya1GnTVoub1cpR14=";
sha256 = "sha256-hmlzv1WaT+KucR7RGPC3bKcIdTxPOvK2s17nDucdu7c=";
};
strictDeps = true;

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl
{ lib, stdenv, fetchurl, fetchpatch2
, meson, ninja, pkg-config, python3, wayland-scanner
, cairo, dbus, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland
, cairo, libdrm, libevdev, libinput, libxkbcommon, mesa, seatd, wayland
, wayland-protocols, xcbutilcursor
, demoSupport ? true
@ -26,6 +26,16 @@ stdenv.mkDerivation rec {
hash = "sha256-62hqfPAJkqI7F/GS/KmohzE+ksNG7jXYV1GWmD1la0o=";
};
patches = [
# ci, backend-vnc: update to Neat VNC 0.7.0
# part of https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1051
(fetchpatch2 {
url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/8895b15f3dfc555a869e310ff6e16ff5dced1336.patch";
hash = "sha256-PGAmQhzG8gZcYRaZwhKPlgzfbILIXGAHLSd9dCHAP1A=";
excludes = [ ".gitlab-ci.yml" ];
})
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
buildInputs = [

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "neatvnc";
version = "0.6.0";
version = "0.7.0";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "sha256-3hNdgfAJGJkMXdB86+u3bKwrvXoMei1YCFXDG4ObkU4=";
sha256 = "sha256-R+PvD7E/z+Gc7h2y0pUYaCkzfgpxzwToOr4pKSrOnxU=";
};
strictDeps = true;