diff options
| author | Nick Cao <nickcao@nichi.co> | 2024-03-16 13:40:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-16 13:40:34 -0700 |
| commit | 19d210bef750d3185e764bb9badce0ade4b98f9f (patch) | |
| tree | 33c4c978a0a6afb33329d39a10f9641363ddff6f | |
| parent | a21f5e24e84b191b452d7e47cb9c275b46ed01c3 (diff) | |
| parent | ba82f247314d304e98e9a08af2b91de23bafe77d (diff) | |
Merge pull request #295423 from NickCao/neatvnc
{neatvnc,wayvnc}: 0.7.2 -> 0.8.0| -rw-r--r-- | pkgs/applications/networking/remote/wayvnc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/window-managers/weston/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/libraries/neatvnc/default.nix | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 19d19310591d5..0712e68e324b5 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6at0p1Xc25K5l6sq2uMWpaLVvZMNlWC0ybyZyrIw41I="; + hash = "sha256-IGEM212CU91+pT8xq3BzrPrIDUZxZveb2jhatMGJAsw="; }; strictDeps = true; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 34532411888cb..b4472425324ee 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; }; + postPatch = '' + # raise neatvnc version bound to 0.8.0 + # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 + substituteInPlace libweston/backend-vnc/meson.build \ + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" + ''; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [ diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 281689c60b679..2680dbd1ae92a 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S2LMD15MYd/t/Z8B1OQ0hVrZQLR6Gf4LB45mhmDwblg="; + hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; }; strictDeps = true; |