spice-gtk: 0.35 -> 0.37

Meson!

Pulseaudio backend has been deprecated upstream
so it has been disabled. Celt has also been disabled
because there's opus.

Other than that optional features have been enabled.

https://gitlab.freedesktop.org/spice/spice-gtk/blob/v0.36/NEWS
https://gitlab.freedesktop.org/spice/spice-gtk/blob/v0.37/NEWS
This commit is contained in:
worldofpeace 2019-05-01 21:36:32 -04:00 committed by worldofpeace
parent 0b39de48af
commit 5f7c701eff

View File

@ -1,8 +1,39 @@
{ stdenv, fetchurl, pkgconfig, spice-protocol, gettext, celt_0_5_1 { stdenv
, openssl, libpulseaudio, pixman, gobject-introspection, libjpeg_turbo, zlib , fetchurl
, cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup , pkgconfig
, withPolkit ? true, polkit, acl, usbutils , fetchpatch
, vala, gtk3, epoxy, libdrm, gst_all_1, phodav, opusfile }: , meson
, ninja
, python3
, spice-protocol
, gettext
, openssl
, libpulseaudio
, pixman
, gobject-introspection
, libjpeg_turbo
, zlib
, cyrus_sasl
, usbredir
, libsoup
, polkit
, acl
, usbutils
, vala
, gtk3
, epoxy
, libdrm
, gst_all_1
, phodav
, libopus
, gtk-doc
, json-glib
, lz4
, libcacard
, perl
, docbook_xsl
, withPolkit ? true
}:
# If this package is built with polkit support (withPolkit=true), # If this package is built with polkit support (withPolkit=true),
# usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root. # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
@ -25,18 +56,15 @@
# KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb" # KERNEL=="*", SUBSYSTEMS=="usb", MODE="0664", GROUP="usb"
# ''; # '';
with stdenv.lib; stdenv.mkDerivation rec {
pname = "spice-gtk";
version = "0.37";
let outputs = [ "out" "dev" "devdoc" "man" ];
inherit (python2Packages) python pygtk;
in stdenv.mkDerivation rec {
name = "spice-gtk-0.35";
outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "https://www.spice-space.org/download/gtk/${name}.tar.bz2"; url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.bz2";
sha256 = "11lymg467gvj5ys8k22ihnfbxjn4x34ygyzirpg2nphjwlyhgrml"; sha256 = "1drvj8y35gnxbnrxsipwi15yh0vs9ixzv4wslz6r3lra8w3bfa0z";
}; };
postPatch = '' postPatch = ''
@ -45,27 +73,50 @@ in stdenv.mkDerivation rec {
--replace 'ACL_HELPER_PATH"/' '"' --replace 'ACL_HELPER_PATH"/' '"'
''; '';
buildInputs = [ nativeBuildInputs = [
spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman docbook_xsl
libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav opusfile gettext
] ++ optionals withPolkit [ polkit acl usbutils ] ; gobject-introspection
gtk-doc
libsoup
meson
ninja
perl
pkgconfig
python3
python3.pkgs.pyparsing
python3.pkgs.six
vala
];
nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobject-introspection ]; buildInputs = [
cyrus_sasl
epoxy
gst_all_1.gst-plugins-base
gtk3
json-glib
libcacard
libdrm
libjpeg_turbo
lz4
openssl
libopus
phodav
pixman
spice-protocol
usbredir
zlib
] ++ stdenv.lib.optionals withPolkit [ polkit acl usbutils ] ;
PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions";
configureFlags = [ mesonFlags = [
"--with-gtk3" "-Dauto_features=enabled"
"--enable-introspection" "-Dcelt051=disabled"
"--enable-vala" "-Dpulse=disabled" # is deprecated upstream
"--enable-celt051"
]; ];
dontDisableStatic = true; # Needed by the coroutine test meta = with stdenv.lib; {
enableParallelBuilding = true;
meta = {
description = "A GTK+3 SPICE widget"; description = "A GTK+3 SPICE widget";
longDescription = '' longDescription = ''
spice-gtk is a GTK+3 SPICE widget. It features glib-based spice-gtk is a GTK+3 SPICE widget. It features glib-based