1 files changed, 17 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index a5d7c775412..2fe7e0bcc23 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,16 +1,20 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, spiceSupport ? true, spice_gtk, shared_mime_info
-, libvirt, libcap_ng, yajl
+, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl
+, gsettings_desktop_schemas, makeWrapper
+, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
 }:
 
+assert spiceSupport ->
+  spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null;
+
 with stdenv.lib;
 
 let sourceInfo = rec {
     baseName="virt-viewer";
-    version="0.6.0";
+    version="2.0";
     name="${baseName}-${version}";
     url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
-    hash="0svalnr6k8rjadysnxixygk3bdx04asmwx75bhrbljyicba216v6";
+    hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
 }; in
 
 stdenv.mkDerivation  {
@@ -23,12 +27,18 @@ stdenv.mkDerivation  {
 
   buildInputs = [ 
     pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl
-    shared_mime_info libvirt libcap_ng yajl
-  ] ++ optional spiceSupport spice_gtk;
+    shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper
+  ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
+
+  postInstall = ''
+    for f in "$out"/bin/*; do
+        wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
 
   meta = {
     description = "A viewer for remote virtual machines";
-    maintainers = maintainers.raskin;
+    maintainers = [ maintainers.raskin ];
     platforms = platforms.linux;
     license = licenses.gpl2;
   };