gupnp-tools: clean up

pkgs/tools/networking/gupnp-tools/default.nix

@@ -1,26 +1,30 @@
-{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, gnome2, makeWrapper}:
+{fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp-av, gnome3, wrapGAppsHook}:
+
+let
+  pname = "gupnp-tools";
+  version = "0.8.13";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
-stdenv.mkDerivation rec {
-  name = "gupnp-tools-${version}";
-  majorVersion = "0.8";
-  version = "${majorVersion}.13";
   src = fetchurl {
-    url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
-  buildInputs = [gupnp libuuid gssdp gtk3 intltool gupnp-av
+  buildInputs = [ gupnp libuuid gssdp gtk3 gupnp-av gnome3.defaultIconTheme ];
-                 gnome2.gnome_icon_theme makeWrapper];
 
-  postInstall = ''
+  passthru = {
-    for program in gupnp-av-cp gupnp-universal-cp; do
+    updateScript = gnome3.updateScript {
-      wrapProgram "$out/bin/$program" \
+      packageName = pname;
-        --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome-themes-standard}/share:${gnome2.gnome_icon_theme}/share:$out/share"
+    };
-    done
+  };
-  '';
 
-  meta = {
+  meta = with stdenv.lib; {
-    platforms = stdenv.lib.platforms.linux;
+    description = "Set of utilities and demos to work with UPnP";
+    homepage = https://wiki.gnome.org/Projects/GUPnP;
+    license = licenses.gpl2Plus;
+    maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }