git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #67543 from worldofpeace/fix-vino

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

commit992d662deb4221377e20d8beb268115c8c64ca5c authorMarek Mahut <marek.mahut@gmail.com> dateTue 27 Aug 2019, 10:34 (7 years ago) parentc41f88115a87bb
1 file changed+74−18
pkgs/desktops/gnome-3/core/vino/default.nix+74−18
pkgs/desktops/gnome-3/core/vino/default.nix+74−18
@@ -1,29 +1,85 @@
1−{ stdenv, fetchurl, lib, wrapGAppsHook
2−, pkgconfig, gnome3, gtk3, glib, intltool, libXtst, libnotify, libsoup
3−, telepathySupport ? false, dbus-glib ? null, telepathy-glib ? null
4−, libsecret, gnutls, libgcrypt, avahi, zlib, libjpeg, libXdamage, libXfixes, libXext
5−, networkmanager }:
6−
7−with lib;
1+{ stdenv
2+, fetchFromGitLab
3+, wrapGAppsHook
4+, pkgconfig
5+, gnome3
6+, gtk3
7+, glib
8+, intltool
9+, libXtst
10+, libnotify
11+, libsoup
12+, libsecret
13+, gnutls
14+, libgcrypt
15+, avahi
16+, zlib
17+, libjpeg
18+, libXdamage
19+, libXfixes
20+, libXext
21+, networkmanager
22+, gnome-common
23+, libtool
24+, automake
25+, autoconf
26+, telepathySupport ? false
27+, dbus-glib ? null
28+, telepathy-glib ? null
29+}:
830
931stdenv.mkDerivation rec {
10− name = "vino-${version}";
11− version = "3.22.0";
32+ pname = "vino";
33+ version = "unstable-2019-07-08";
1234
13− src = fetchurl {
14− url = "mirror://gnome/sources/vino/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
15− sha256 = "2911c779b6a2c46e5bc8e5a0c94c2a4d5bd4a1ee7e35f2818702cb13d9d23bab";
35+ src = fetchFromGitLab {
36+ domain = "gitlab.gnome.org";
37+ owner = "GNOME";
38+ repo = "vino";
39+ rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21";
40+ sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3";
1641 };
1742
1843 doCheck = true;
1944
20− nativeBuildInputs = [ intltool wrapGAppsHook pkgconfig ];
45+ nativeBuildInputs = [
46+ autoconf
47+ automake
48+ gnome-common
49+ intltool
50+ libtool
51+ pkgconfig
52+ wrapGAppsHook
53+ ];
2154
2255 buildInputs = [
23− gnome3.adwaita-icon-theme gtk3 glib libXtst libnotify libsoup
24− libsecret gnutls libgcrypt avahi zlib libjpeg
25− libXdamage libXfixes libXext networkmanager
26− ] ++ optionals telepathySupport [ dbus-glib telepathy-glib ];
56+ avahi
57+ glib
58+ gnome3.adwaita-icon-theme
59+ gnutls
60+ gtk3
61+ libXdamage
62+ libXext
63+ libXfixes
64+ libXtst
65+ libgcrypt
66+ libjpeg
67+ libnotify
68+ libsecret
69+ libsoup
70+ networkmanager
71+ zlib
72+ ]
73+ ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ]
74+ ;
75+
76+ preConfigure = ''
77+ NOCONFIGURE=1 ./autogen.sh
78+ '';
79+
80+ postInstall = stdenv.lib.optionalString (!telepathySupport) ''
81+ rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
82+ '';
2783
2884 passthru = {
2985 updateScript = gnome3.updateScript {
@@ -35,7 +91,7 @@ stdenv.mkDerivation rec {
3591 meta = with stdenv.lib; {
3692 homepage = https://wiki.gnome.org/Projects/Vino;
3793 description = "GNOME desktop sharing server";
38− maintainers = with maintainers; [ lethalman domenkozar ];
94+ maintainers = gnome3.maintainers;
3995 license = licenses.gpl2;
4096 platforms = platforms.linux;
4197 };