mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-01 07:01:54 +00:00
libnice: 0.1.14 -> 0.1.15
Port to meson, split outputs, enable tests.
This commit is contained in:
parent
23e49b78e5
commit
aca57f1aed
@ -1,18 +1,53 @@
|
||||
{ stdenv, fetchurl, pkgconfig, 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 {
|
||||
name = "libnice-0.1.14";
|
||||
name = "libnice-0.1.15";
|
||||
|
||||
outputs = [ "bin" "out" "dev" "devdoc" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://nice.freedesktop.org/releases/${name}.tar.gz";
|
||||
sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my";
|
||||
sha256 = "1nl7fn07f4i513s9c1s1ic3rki8rm2d000wsf6f4157mb0zhya7p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig ];
|
||||
patches = [
|
||||
# Fix generating data
|
||||
# Note: upstream is not willing to merge our fix
|
||||
# https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871
|
||||
(fetchpatch {
|
||||
url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch;
|
||||
sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg";
|
||||
})
|
||||
|
||||
# Fix test-different-number-streams
|
||||
# https://gitlab.freedesktop.org/libnice/libnice/merge_requests/36
|
||||
(fetchpatch {
|
||||
url = https://gitlab.freedesktop.org/libnice/libnice/commit/a38c2adfc4bed2a69dc02568417f0926dd555b9a.patch;
|
||||
sha256 = "1rh4z4iknrimmm3b3v8ln8vl3dsqi91g4vf0dl85348kvnf0sv6z";
|
||||
})
|
||||
# Fix test-gstreamer
|
||||
# https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35
|
||||
(fetchpatch {
|
||||
url = https://gitlab.freedesktop.org/libnice/libnice/commit/02de1fa1956105b09d9db4fd6331452b0ff0b8a2.patch;
|
||||
sha256 = "12dymq1v20wj5n1cway4n3y8fkra1ffnpj5w7pbz38i612b82qw0";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
|
||||
buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
|
||||
propagatedBuildInputs = [ glib gupnp-igd ];
|
||||
|
||||
doCheck = false; # fails with "fatal error: nice/agent.h: No such file or directory"
|
||||
mesonFlags = [
|
||||
"-Dgupnp=enabled"
|
||||
"-Dgstreamer=enabled"
|
||||
"-Dignored-network-interface-prefix=enabled"
|
||||
"-Dexamples=enabled"
|
||||
"-Dtests=enabled"
|
||||
"-Dgtk_doc=enabled"
|
||||
"-Dintrospection=enabled"
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://nice.freedesktop.org/wiki/;
|
||||
|
Loading…
Reference in New Issue
Block a user