From 729fb7a44062c6878d5e20e49dd9b827ca8a8605 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 Dec 2015 12:08:10 +0000
Subject: virt-viewer: fix build and clean up

---
 .../virtualization/virt-viewer/default.nix         | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

(limited to 'pkgs/applications/virtualization')

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index a6e3dfff060..f63eeb60306 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 = ''
-- 
cgit 1.4.1