virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support
- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1
[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
(instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
virt-manager. Without it:
GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
This commit is contained in:
committed by
Bjørn Forsman
parent
85b1ede2bf
commit
413ebfb246
@@ -1,8 +1,8 @@
|
||||
{ stdenv, fetchurl
|
||||
{ stdenv, fetchurl, gobjectIntrospection
|
||||
, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
|
||||
, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio
|
||||
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt }:
|
||||
|
||||
, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
|
||||
, pygobject3, enableGTK3 ? false }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gtk-vnc-${version}";
|
||||
@@ -14,21 +14,24 @@ stdenv.mkDerivation rec {
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
python gtk pygtk gnutls cairo libtool pkgconfig glib libffi libgcrypt
|
||||
intltool cyrus_sasl pulseaudio pygobject perl perlPackages.TextCSV
|
||||
];
|
||||
python gnutls cairo libtool pkgconfig glib libffi libgcrypt
|
||||
intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV
|
||||
gobjectIntrospection
|
||||
] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-fstack-protector-all";
|
||||
configureFlags = [
|
||||
"--with-python"
|
||||
"--with-examples"
|
||||
(if enableGTK3 then "--with-gtk=3.0" else "--with-gtk=2.0")
|
||||
];
|
||||
|
||||
makeFlags = "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
|
||||
makeFlags = stdenv.lib.optionalString (!enableGTK3)
|
||||
"CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/";
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "A GTK VNC widget";
|
||||
maintainers = with maintainers; [ raskin ];
|
||||
maintainers = with maintainers; [ raskin offline ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.lgpl21;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user