diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2017-03-18 19:05:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-18 19:05:11 +0100 |
| commit | dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb (patch) | |
| tree | 99e830a2cc77160448500c6938e21b12c4b30c8c /pkgs/applications/virtualization | |
| parent | d221e40fd7f3beb8295b628122cd7e59beb09505 (diff) | |
| parent | d4294265fd1fe752884d8d2c2cfa40f8bead6e80 (diff) | |
| download | nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.tar nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.tar.gz nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.tar.bz2 nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.tar.lz nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.tar.xz nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.tar.zst nixlib-dfbd2dd6597ad0f86b69a7fc4a26d6ded6001abb.zip | |
Merge pull request #23624 from volth/virt-viewer-5.0
virt-viewer: 2.0 -> 5.0
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index f63eeb603068..b8de872d6ff4 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 |