gtk-vnc: 0.7.0 → 0.9.0

1 files changed, 20 insertions, 27 deletions

diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index cd6cf90a5aa..bd3b2392c7e 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -1,49 +1,42 @@
 { stdenv, fetchurl, gobjectIntrospection
 , gnutls, cairo, libtool, glib, pkgconfig
-, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio
-, libgcrypt, gtk3, vala_0_32
-, libogg, libgpgerror, pythonPackages }:
+, cyrus_sasl, intltool, libpulseaudio
+, libgcrypt, gtk3, vala, gnome3
+, python3 }:
 
-let
-  inherit (pythonPackages) pygobject3 python;
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
-  version = "0.7.0";
+  version = "0.9.0";
+
+  outputs = [ "out" "bin" "man" "dev" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz";
-    sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw";
+    url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    python3 pkgconfig intltool libtool gobjectIntrospection vala
+  ];
   buildInputs = [
-    python gnutls cairo libtool glib libffi libgcrypt
-    intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV
-    gobjectIntrospection libogg libgpgerror
-    gtk3 vala_0_32 pygobject3
+    gnutls cairo glib libgcrypt cyrus_sasl libpulseaudio gtk3
   ];
 
-  NIX_CFLAGS_COMPILE = "-fstack-protector-all";
   configureFlags = [
-    "--with-python"
     "--with-examples"
   ];
 
-  # Fix broken .la files
-  preFixup = ''
-    sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la
-  '';
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gtk-vnc";
+    };
+  };
 
   meta = with stdenv.lib; {
     description = "A GTK VNC widget";
+    homepage = https://wiki.gnome.org/Projects/gtk-vnc;
+    license = licenses.lgpl21;
     maintainers = with maintainers; [ raskin offline ];
     platforms = platforms.linux;
-    license = licenses.lgpl21;
-  };
-
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc";
-    };
   };
 }