Unverified Commit 19d210be authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #295423 from NickCao/neatvnc 

{neatvnc,wayvnc}: 0.7.2 -> 0.8.0
parents a21f5e24 ba82f247

pkgs/applications/networking/remote/wayvnc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/applications/window-managers/weston/default.nix

+7 −0
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/libraries/neatvnc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;