gnome3.vino: remove
It has been removed from g-s-d, only a tiny bit remain in g-c-c.
This commit is contained in:
parent
981ba77ebc
commit
30ef9b92fa
@ -253,7 +253,6 @@ in
|
||||
systemd.packages = with pkgs.gnome3; [
|
||||
gnome-session
|
||||
gnome-shell
|
||||
vino
|
||||
];
|
||||
|
||||
services.avahi.enable = mkDefault true;
|
||||
@ -305,7 +304,7 @@ in
|
||||
environment = mkForce {};
|
||||
};
|
||||
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-shell.bst
|
||||
environment.systemPackages = with pkgs.gnome3; [
|
||||
adwaita-icon-theme
|
||||
gnome-backgrounds
|
||||
@ -324,11 +323,10 @@ in
|
||||
pkgs.hicolor-icon-theme
|
||||
pkgs.shared-mime-info # for update-mime-database
|
||||
pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
|
||||
vino
|
||||
];
|
||||
})
|
||||
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst
|
||||
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-utilities.bst
|
||||
(mkIf serviceCfg.core-utilities.enable {
|
||||
environment.systemPackages = (with pkgs.gnome3; removePackagesByName [
|
||||
baobab
|
||||
|
@ -60,7 +60,6 @@
|
||||
, tzdata
|
||||
, udisks2
|
||||
, upower
|
||||
, vino
|
||||
, epoxy
|
||||
, gnome-user-share
|
||||
, gnome-remote-desktop
|
||||
@ -133,7 +132,6 @@ stdenv.mkDerivation rec {
|
||||
tracker
|
||||
udisks2
|
||||
upower
|
||||
vino
|
||||
epoxy
|
||||
];
|
||||
|
||||
|
@ -1,98 +0,0 @@
|
||||
{ stdenv
|
||||
, fetchFromGitLab
|
||||
, wrapGAppsHook
|
||||
, pkgconfig
|
||||
, gnome3
|
||||
, gtk3
|
||||
, 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 {
|
||||
pname = "vino";
|
||||
version = "unstable-2019-07-08";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.gnome.org";
|
||||
owner = "GNOME";
|
||||
repo = "vino";
|
||||
rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21";
|
||||
sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3";
|
||||
};
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoconf
|
||||
automake
|
||||
gnome-common
|
||||
intltool
|
||||
libtool
|
||||
pkgconfig
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
avahi
|
||||
glib
|
||||
gnome3.adwaita-icon-theme
|
||||
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 {
|
||||
# packageName = "vino";
|
||||
# attrPath = "gnome3.vino";
|
||||
# };
|
||||
};
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://wiki.gnome.org/Projects/Vino;
|
||||
description = "GNOME desktop sharing server";
|
||||
maintainers = gnome3.maintainers;
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
@ -146,8 +146,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
totem = callPackage ./core/totem { };
|
||||
|
||||
vino = callPackage ./core/vino { };
|
||||
|
||||
yelp = callPackage ./core/yelp { };
|
||||
|
||||
yelp-xsl = callPackage ./core/yelp-xsl { };
|
||||
@ -358,4 +356,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
inherit (pkgs) dconf; # added 2019-11-30
|
||||
|
||||
inherit (pkgs) networkmanagerapplet; # added 2019-12-12
|
||||
|
||||
vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user