Merge pull request #116118 from maxeaubrey/gupnp-igd_1.2.0

gupnp-igd: 0.2.5 -> 1.2.0
This commit is contained in:
Jan Tojnar 2021-03-14 02:31:43 +01:00 committed by GitHub
commit ab4767964e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,8 +1,8 @@
{ lib, stdenv { lib, stdenv
, fetchurl , fetchurl
, fetchpatch
, autoreconfHook
, pkg-config , pkg-config
, meson
, ninja
, gettext , gettext
, gobject-introspection , gobject-introspection
, gtk-doc , gtk-doc
@ -15,26 +15,19 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gupnp-igd"; pname = "gupnp-igd";
version = "0.2.5"; version = "1.2.0";
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "081v1vhkbz3wayv49xfiskvrmvnpx93k25am2wnarg5cifiiljlb"; sha256 = "sha256-S1EgCYqhPt0ngYup7k1/6WG/VAv1DQVv9wPGFUXgK+E=";
}; };
patches = [
# Add gupnp-1.2 compatibility
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch";
sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
autoreconfHook meson
ninja
gettext gettext
gobject-introspection gobject-introspection
gtk-doc gtk-doc
@ -47,8 +40,8 @@ stdenv.mkDerivation rec {
gupnp gupnp
]; ];
configureFlags = [ mesonFlags = [
"--enable-gtk-doc" "-Dgtk_doc=true"
]; ];
doCheck = true; doCheck = true;
@ -62,7 +55,7 @@ stdenv.mkDerivation rec {
meta = with lib; { meta = with lib; {
description = "Library to handle UPnP IGD port mapping"; description = "Library to handle UPnP IGD port mapping";
homepage = "http://www.gupnp.org/"; homepage = "http://www.gupnp.org/";
license = licenses.lgpl21; license = licenses.lgpl21Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }