diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/development/libraries/neatvnc | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/neatvnc')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/neatvnc/default.nix | 18 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch | 17 |
2 files changed, 10 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 127f25a50bea..dfc1a1571587 100644 --- a/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -1,24 +1,25 @@ { stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, libuv, gnutls, libdrm -# libjpeg_turbo: Optional, for tight encoding (disabled because experimental) -, enableCpuAcceleration ? false # Whether to use CPU extensions (e.g. AVX) +, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.1.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "04wcpwxlcf0bczcs97j21346mn6finfj7xgc2dsrwrw9xq8qa7wc"; + sha256 = "1209dzlmqf5p1cqzf6kss5inwgj644ynrh9qgpjf1kskqwfxn1c4"; }; - nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman libuv gnutls libdrm ]; + postPatch = '' + substituteInPlace meson.build --replace \ + "version: '0.2.0'" "version: '${version}'" + ''; - patches = stdenv.lib.optional (!enableCpuAcceleration) ./disable-cpu-acceleration.patch; + nativeBuildInputs = [ meson pkg-config ninja ]; + buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; meta = with stdenv.lib; { description = "A VNC server library"; @@ -30,6 +31,7 @@ stdenv.mkDerivation rec { - Interoperability with the Freedesktop.org ecosystem ''; inherit (src.meta) homepage; + changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/nixpkgs/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch b/nixpkgs/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch deleted file mode 100644 index 97b77c02df48..000000000000 --- a/nixpkgs/pkgs/development/libraries/neatvnc/disable-cpu-acceleration.patch +++ /dev/null @@ -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') |