mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
neatvnc: 0.1.0 -> 0.2.0
This commit is contained in:
parent
2f56b88d5f
commit
715cd6cc1d
@ -1,24 +1,20 @@
|
|||||||
{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
|
{ stdenv, fetchFromGitHub, meson, pkg-config, ninja
|
||||||
, pixman, libuv, gnutls, libdrm
|
, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml
|
||||||
# libjpeg_turbo: Optional, for tight encoding (disabled because experimental)
|
|
||||||
, enableCpuAcceleration ? false # Whether to use CPU extensions (e.g. AVX)
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "neatvnc";
|
pname = "neatvnc";
|
||||||
version = "0.1.0";
|
version = "0.2.0";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "any1";
|
owner = "any1";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "04wcpwxlcf0bczcs97j21346mn6finfj7xgc2dsrwrw9xq8qa7wc";
|
sha256 = "036kzhbabbwc3gvsw8kqf6rs0gh8kgn6i0by9pxski38mi0qs1qs";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ meson pkg-config ninja ];
|
nativeBuildInputs = [ meson pkg-config ninja ];
|
||||||
buildInputs = [ pixman libuv gnutls libdrm ];
|
buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ];
|
||||||
|
|
||||||
patches = stdenv.lib.optional (!enableCpuAcceleration) ./disable-cpu-acceleration.patch;
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A VNC server library";
|
description = "A VNC server library";
|
||||||
@ -30,6 +26,7 @@ stdenv.mkDerivation rec {
|
|||||||
- Interoperability with the Freedesktop.org ecosystem
|
- Interoperability with the Freedesktop.org ecosystem
|
||||||
'';
|
'';
|
||||||
inherit (src.meta) homepage;
|
inherit (src.meta) homepage;
|
||||||
|
changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}";
|
||||||
license = licenses.isc;
|
license = licenses.isc;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ primeos ];
|
maintainers = with maintainers; [ primeos ];
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 31dd8b8..8761087 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -21,12 +21,6 @@ endif
|
|
||||||
|
|
||||||
cpu = host_machine.cpu_family()
|
|
||||||
|
|
||||||
-if cpu == 'x86_64'
|
|
||||||
- c_args += '-mavx'
|
|
||||||
-elif cpu == 'arm'
|
|
||||||
- c_args += '-mfpu=neon'
|
|
||||||
-endif
|
|
||||||
-
|
|
||||||
add_project_arguments(c_args, language: 'c')
|
|
||||||
|
|
||||||
cc = meson.get_compiler('c')
|
|
Loading…
Reference in New Issue
Block a user