libnice: clean up

* format withn nixpkgs-fmt
* drop unnecessary flags
* do not propagate gupnp-igd (it is only in Requires.private)
This commit is contained in:
Jan Tojnar 2019-11-13 21:52:55 +01:00
parent 5b1920fd06
commit c14398f871
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,4 +1,19 @@
{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: { stdenv
, fetchurl
, fetchpatch
, meson
, ninja
, pkgconfig
, python3
, gobject-introspection
, gtk-doc
, docbook_xsl
, docbook_xml_dtd_412
, glib
, gupnp-igd
, gst_all_1
, gnutls
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libnice-0.1.16"; name = "libnice-0.1.16";
@ -21,27 +36,40 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig python3 gobject-introspection meson
ninja
pkgconfig
python3
gobject-introspection
# documentation
gtk-doc gtk-doc
# Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` docbook_xsl
docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_412
];
buildInputs = [
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
gnutls
gupnp-igd
];
propagatedBuildInputs = [
glib
]; ];
buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
propagatedBuildInputs = [ glib gupnp-igd ];
mesonFlags = [ mesonFlags = [
# Enables all features, so that we know when new dependencies are necessary.
"-Dauto_features=enabled"
"-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15 "-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15
"-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dexamples=disabled" # requires many dependencies and probably not useful for our users
]; ];
# TODO; see #53293 etc. # Tests are flaky
#doCheck = true; # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295
doCheck = false;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://nice.freedesktop.org/wiki/; description = "GLib ICE implementation";
description = "The GLib ICE implementation";
longDescription = '' longDescription = ''
Libnice is an implementation of the IETF's Interactice Connectivity Libnice is an implementation of the IETF's Interactice Connectivity
Establishment (ICE) standard (RFC 5245) and the Session Traversal Establishment (ICE) standard (RFC 5245) and the Session Traversal
@ -49,6 +77,7 @@ stdenv.mkDerivation rec {
It provides a GLib-based library, libnice and a Glib-free library, It provides a GLib-based library, libnice and a Glib-free library,
libstun as well as GStreamer elements.''; libstun as well as GStreamer elements.'';
homepage = "https://nice.freedesktop.org/wiki/";
platforms = platforms.linux; platforms = platforms.linux;
license = with licenses; [ lgpl21 mpl11 ]; license = with licenses; [ lgpl21 mpl11 ];
}; };