Merge pull request #67543 from worldofpeace/fix-vino

gnome3.vino: 3.22.0 -> 2019-07-08

pkgs/desktops/gnome-3/core/vino/default.nix

@@ -1,29 +1,85 @@
-{ stdenv, fetchurl, lib, wrapGAppsHook
+{ stdenv
-, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
+, fetchFromGitLab
-, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null
+, wrapGAppsHook
-, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext
+, pkgconfig
-, networkmanager }:
+, gnome3
-
+, gtk3
-with lib;
+, glib
+, intltool
+, libXtst
+, libnotify
+, libsoup
+, libsecret
+, gnutls
+, libgcrypt
+, avahi
+, zlib
+, libjpeg
+, libXdamage
+, libXfixes
+, libXext
+, networkmanager
+, gnome-common
+, libtool
+, automake
+, autoconf
+, telepathySupport ? false
+, dbus-glib ? null
+, telepathy-glib ? null
+}:
 
 stdenv.mkDerivation rec {
-  name = "vino-${version}";
+  pname = "vino";
-  version = "3.22.0";
+  version = "unstable-2019-07-08";
 
-  src = fetchurl {
+  src = fetchFromGitLab {
-    url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    domain = "gitlab.gnome.org";
-    sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
+    owner = "GNOME";
+    repo = "vino";
+    rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21";
+    sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3";
   };
 
   doCheck = true;
 
-  nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gnome-common
+    intltool
+    libtool
+    pkgconfig
+    wrapGAppsHook
+  ];
 
   buildInputs = [
-    gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
+    avahi
-    libsecret gnutls libgcrypt avahi zlib libjpeg
+    glib
-    libXdamage libXfixes libXext networkmanager
+    gnome3.adwaita-icon-theme
-  ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
+    gnutls
+    gtk3
+    libXdamage
+    libXext
+    libXfixes
+    libXtst
+    libgcrypt
+    libjpeg
+    libnotify
+    libsecret
+    libsoup
+    networkmanager
+    zlib
+  ]
+  ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ]
+  ;
+
+  preConfigure = ''
+    NOCONFIGURE=1 ./autogen.sh
+  '';
+
+  postInstall = stdenv.lib.optionalString (!telepathySupport) ''
+    rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
+  '';
 
   passthru = {
     updateScript = gnome3.updateScript {
@@ -35,7 +91,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Vino;
     description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman domenkozar ];
+    maintainers = gnome3.maintainers;
     license = licenses.gpl2;
     platforms = platforms.linux;
   };