diff options
-rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/libraries/spice-gtk/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index f63eeb6030686..b8de872d6ff40 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp , libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl -, gsettings_desktop_schemas, makeWrapper, xen, numactl +, gsettings_desktop_schemas, makeWrapper, xen, numactl, libvirt-glib , spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null }: @@ -11,19 +11,20 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "2.0"; + version = "5.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9"; + sha256 = "0blbp1wkw8ahss9va0bmcz2yx18j0mvm6fzrzhh2ly3sja5ysb8b"; }; buildInputs = [ pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper - xen numactl - ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; + numactl libvirt-glib + ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm + ] ++ optional (stdenv.system == "x86_64-linux") xen; postInstall = '' for f in "$out"/bin/*; do diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 325d665aaf65a..240de378afc7f 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; let inherit (python2Packages) python pygtk; in stdenv.mkDerivation rec { - name = "spice-gtk-0.32"; + name = "spice-gtk-0.33"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"; + sha256 = "0fdgx9k4vgmasp8i2n0swrkapq8f212igcg7wsgvr3mbhsvk7bvx"; }; buildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f3766915e33e..a27378e1f77c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15718,9 +15718,7 @@ with pkgs; inherit (lua52Packages) lpeg; }; - virt-viewer = callPackage ../applications/virtualization/virt-viewer { - spice_gtk = spice_gtk; - }; + virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; virt-top = callPackage ../applications/virtualization/virt-top { ocamlPackages = ocamlPackages_4_01_0; |