diff options
| author | Robin Gloster <mail@glob.in> | 2015-12-24 12:08:10 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2015-12-28 21:44:12 +0000 |
| commit | 729fb7a44062c6878d5e20e49dd9b827ca8a8605 (patch) | |
| tree | 9755f273151a3814aa53936ee4c49b9fbfde09c8 | |
| parent | 8260022a1bf7c4a63b095ad96eeb36c1e7786c84 (diff) | |
| download | nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.tar nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.tar.gz nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.tar.bz2 nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.tar.lz nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.tar.xz nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.tar.zst nixlib-729fb7a44062c6878d5e20e49dd9b827ca8a8605.zip | |
virt-viewer: fix build and clean up
| -rw-r--r-- | pkgs/applications/virtualization/virt-viewer/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
2 files changed, 12 insertions, 16 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index a6e3dfff0603..f63eeb603068 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, numactl +, gsettings_desktop_schemas, makeWrapper, xen, numactl , spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null }: @@ -9,25 +9,20 @@ assert spiceSupport -> with stdenv.lib; -let sourceInfo = rec { - baseName="virt-viewer"; - version="2.0"; - name="${baseName}-${version}"; - url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9"; -}; in - -stdenv.mkDerivation { - inherit (sourceInfo) name version; +stdenv.mkDerivation rec { + baseName = "virt-viewer"; + version = "2.0"; + name = "${baseName}-${version}"; src = fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; + url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; + sha256 = "0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9"; }; - buildInputs = [ - pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl numactl + 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 ]; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05a1525fd4bb..e8ceb32a499d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13469,7 +13469,7 @@ let neovim-pygui = pythonPackages.neovim_gui; - virtviewer = callPackage ../applications/virtualization/virt-viewer { + virt-viewer = callPackage ../applications/virtualization/virt-viewer { gtkvnc = gtkvnc.override { enableGTK3 = true; }; spice_gtk = spice_gtk.override { enableGTK3 = true; }; }; @@ -15865,6 +15865,7 @@ aliases = with self; rec { tftp_hpa = tftp-hpa; # added 2015-04-03 manpages = man-pages; # added 2015-12-06 mssys = ms-sys; # added 2015-12-13 + virtviewer = virt-viewer; # added 2015-12-24 }; tweakAlias = _n: alias: with lib; |