summary refs log tree commit diff
path: root/pkgs/development/libraries/gupnp-igd
diff options
context:
space:
mode:
authorMaxine Aubrey <maxeaubrey@gmail.com>2021-03-13 00:36:56 +0100
committerMaxine Aubrey <maxeaubrey@gmail.com>2021-03-14 02:14:58 +0100
commit4693291f625999111b181759fc56ffe3d51499f7 (patch)
treed18f9a41d7334748f872cc1917de8c4a63470ec4 /pkgs/development/libraries/gupnp-igd
parent0fad702a50b12266722fce7df48003d4316eee85 (diff)
downloadnixpkgs-4693291f625999111b181759fc56ffe3d51499f7.tar
nixpkgs-4693291f625999111b181759fc56ffe3d51499f7.tar.gz
nixpkgs-4693291f625999111b181759fc56ffe3d51499f7.tar.bz2
nixpkgs-4693291f625999111b181759fc56ffe3d51499f7.tar.lz
nixpkgs-4693291f625999111b181759fc56ffe3d51499f7.tar.xz
nixpkgs-4693291f625999111b181759fc56ffe3d51499f7.tar.zst
nixpkgs-4693291f625999111b181759fc56ffe3d51499f7.zip
gupnp-igd: 0.2.5 -> 1.2.0
Diffstat (limited to 'pkgs/development/libraries/gupnp-igd')
-rw-r--r--pkgs/development/libraries/gupnp-igd/default.nix25
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 2dad33949f3..09fae015b50 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;
   };
 }