diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-03-14 02:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-14 02:31:43 +0100 |
| commit | ab4767964e843954db58ff8a4f81138a072f123c (patch) | |
| tree | 32d9de2a822c2d96b939b1827d323bcf6129ccb9 | |
| parent | 84d339448498eb06f702510c6d1942fcd2e8c10d (diff) | |
| parent | 4693291f625999111b181759fc56ffe3d51499f7 (diff) | |
Merge pull request #116118 from maxeaubrey/gupnp-igd_1.2.0
gupnp-igd: 0.2.5 -> 1.2.0
| -rw-r--r-- | pkgs/development/libraries/gupnp-igd/default.nix | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 2dad33949f3f..09fae015b503 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -1,8 +1,8 @@ { lib, stdenv , fetchurl -, fetchpatch -, autoreconfHook , pkg-config +, meson +, ninja , gettext , gobject-introspection , gtk-doc @@ -15,26 +15,19 @@ stdenv.mkDerivation rec { pname = "gupnp-igd"; - version = "0.2.5"; + version = "1.2.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { 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 = [ pkg-config - autoreconfHook + meson + ninja gettext gobject-introspection gtk-doc @@ -47,8 +40,8 @@ stdenv.mkDerivation rec { gupnp ]; - configureFlags = [ - "--enable-gtk-doc" + mesonFlags = [ + "-Dgtk_doc=true" ]; doCheck = true; @@ -62,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to handle UPnP IGD port mapping"; homepage = "http://www.gupnp.org/"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; platforms = platforms.linux; }; } |