wayvnc: 0.1.2 -> 0.2.0

This commit is contained in:
Michael Weiss 2020-07-28 14:58:04 +02:00
parent 715cd6cc1d
commit 2f641ec844
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
2 changed files with 5 additions and 32 deletions

View file

@ -1,20 +0,0 @@
diff --git a/meson.build b/meson.build
index cc6fa03..7c2b280 100644
--- a/meson.build
+++ b/meson.build
@@ -24,6 +24,7 @@ add_project_arguments(c_args, language: 'c')
cc = meson.get_compiler('c')
libm = cc.find_library('m', required: false)
+librt = cc.find_library('rt', required: false)
pixman = dependency('pixman-1')
libuv = dependency('libuv')
@@ -65,6 +66,7 @@ sources = [
dependencies = [
libm,
+ librt,
pixman,
libuv,
egl,

View file

@ -1,27 +1,20 @@
{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
, pixman, libuv, libGL, libxkbcommon, wayland, neatvnc, libdrm, libX11
, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml
}:
stdenv.mkDerivation rec {
pname = "wayvnc";
version = "0.1.2";
version = "0.2.0";
src = fetchFromGitHub {
owner = "any1";
repo = pname;
rev = "v${version}";
sha256 = "0aa12fkbwhzs0g2pqw1b27l33nn5dpbcvsf1z8h88kwsf9xdvb2r";
sha256 = "1ddcf8hrxhx4rcwvbjwa5j3ygiwca2dpw26wl37pb0q0jr81wylv";
};
patches = [ ./add-missing-librt.patch ];
postPatch = ''
substituteInPlace meson.build \
--replace "version: '0.1.0'" "version: '${version}'"
'';
nativeBuildInputs = [ meson pkg-config ninja ];
buildInputs = [ pixman libuv libGL libxkbcommon wayland neatvnc libdrm libX11 ];
nativeBuildInputs = [ meson pkg-config ninja wayland ];
buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml ];
meta = with stdenv.lib; {
description = "A VNC server for wlroots based Wayland compositors";