JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk-vnc: rename from gtkvnc

Browse Source 
Upstream uses gtk-vnc, let’s be consistent.
This commit is contained in:
Jan Tojnar 2018-08-24 14:35:32 +02:00
parent 21e9b85928
commit 05992b9b1b
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, python2Packages, intltool, file
, wrapGAppsHook, gtkvnc, vte, avahi, dconf
, wrapGAppsHook, gtk-vnc, vte, avahi, dconf
, gobjectIntrospection, libvirt-glib, system-libvirt
, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
, spiceSupport ? true, spice-gtk ? null
@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec {
];
buildInputs =
[ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi
[ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi
gsettings-desktop-schemas libosinfo gtk3
] ++ optional spiceSupport spice-gtk;

4
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp
, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
, libapparmor, gst_all_1
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib
libcap_ng numactl libapparmor
] ++ optionals stdenv.isx86_64 [

4
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib
, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk
, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ spice-gtk ];
buildInputs = [
libvirt-glib glib gtk3 gtkvnc libxml2
libvirt-glib glib gtk3 gtk-vnc libxml2
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
gnome3.defaultIconTheme librsvg acl libgudev libsecret

4
pkgs/desktops/gnome-3/apps/vinagre/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool
, libsecret, itstool, makeWrapper, librsvg }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret
buildInputs = [ gtk3 vte libxml2 gtk-vnc intltool libsecret
itstool makeWrapper gnome3.defaultIconTheme librsvg ];
NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";

2
pkgs/desktops/gnome-3/default.nix
View File

@ -43,7 +43,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };

2
pkgs/top-level/all-packages.nix
View File

@ -2963,7 +2963,7 @@ with pkgs;
gtkperf = callPackage ../development/tools/misc/gtkperf { };
gtkvnc = callPackage ../tools/admin/gtk-vnc {};
gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
gtmess = callPackage ../applications/networking/instant-messengers/gtmess { };