diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-07-28 14:58:04 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-07-28 15:01:16 +0200 |
commit | 2f641ec844a72be197006da5a8a4b0b1f61c9129 (patch) | |
tree | c1ad502a8b9e2c7885efeb8229c9f26a2142d5d1 /pkgs/applications/networking/remote | |
parent | 715cd6cc1da5579dbb8daef2bebbbf00b65b6153 (diff) |
wayvnc: 0.1.2 -> 0.2.0
Diffstat (limited to 'pkgs/applications/networking/remote')
-rw-r--r-- | pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch | 20 | ||||
-rw-r--r-- | pkgs/applications/networking/remote/wayvnc/default.nix | 17 |
2 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch b/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch deleted file mode 100644 index e2d617bcc7ca9..0000000000000 --- a/pkgs/applications/networking/remote/wayvnc/add-missing-librt.patch +++ /dev/null @@ -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, diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 4ca6ae952580f..32373e22b762f 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -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"; |