From 413ebfb2469b394a4f4d48ba3567be3c68344722 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 23 Mar 2014 18:12:07 +0100 Subject: virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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. ] --- pkgs/development/libraries/spice-gtk/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkgs/development/libraries/spice-gtk') diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 60bf24dfd7844..adb1fe90558e1 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 , openssl, pulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib -, cyrus_sasl, python, pygtk, autoconf, automake, libtool }: +, cyrus_sasl, python, pygtk, autoconf, automake, libtool, usbredir +, gtk3, enableGTK3 ? false }: with stdenv.lib; @@ -13,9 +14,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection - libjpeg_turbo zlib cyrus_sasl python pygtk - ]; + spice_protocol celt_0_5_1 openssl pulseaudio pixman gobjectIntrospection + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir + ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); nativeBuildInputs = [ pkgconfig intltool libtool autoconf automake ]; @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-maintainer-mode" - "--with-gtk=2.0" + (if enableGTK3 then "--with-gtk3" else "--with-gtk=2.0") ]; dontDisableStatic = true; # Needed by the coroutine test -- cgit 1.4.1