From aae3987047688411e60970fdf497785d46710a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sat, 16 Mar 2019 01:29:38 +0100 Subject: [PATCH] gupnp-igd: add gupnp-1.2 compatibility --- .../libraries/gupnp-igd/default.nix | 49 +++++++++++++++++-- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 05c8522aebc..56a274316e8 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,18 +1,51 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp }: +{ stdenv +, fetchurl +, fetchpatch +, autoreconfHook +, pkgconfig +, gettext +, gobject-introspection +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +, gupnp +, gnome3 +}: stdenv.mkDerivation rec { - name = "gupnp-igd-${version}"; + pname = "gupnp-igd"; version = "0.2.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gupnp-igd/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; }; - nativeBuildInputs = [ pkgconfig gettext gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; - propagatedBuildInputs = [ glib gupnp ]; + patches = [ + # Add gupnp-1.2 compatibility + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch; + sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2"; + }) + ]; + + nativeBuildInputs = [ + pkgconfig + autoreconfHook + gettext + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + ]; + + propagatedBuildInputs = [ + glib + gupnp + ]; configureFlags = [ "--enable-gtk-doc" @@ -20,6 +53,12 @@ stdenv.mkDerivation rec { doCheck = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { description = "Library to handle UPnP IGD port mapping"; homepage = http://www.gupnp.org/;