about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/virt-viewer/default.nix
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2014-12-16 09:35:39 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2014-12-16 10:48:40 +0100
commit477bc035688ff32e5aa10cc145e65ffdc730a207 (patch)
tree8b3221198e50406cdee5911083b216a61e6fb268 /pkgs/applications/virtualization/virt-viewer/default.nix
parent80838029ac4312b378270df363dc17ed54d21eae (diff)
downloadnixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.tar
nixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.tar.gz
nixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.tar.bz2
nixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.tar.lz
nixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.tar.xz
nixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.tar.zst
nixlib-477bc035688ff32e5aa10cc145e65ffdc730a207.zip
virt-viewer: fix SPICE support
* Add missing dependency on 'spice_protocol'

* Fix new build error which came now that ./configure enables SPICE support:

  building virt-viewer
    CCLD     virt-viewer
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lgdbm
  /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lcap
  collect2: error: ld returned 1 exit status

  Fix by adding gddbm and libcap as inputs. Yes, libcap is needed
  _in addition_ to libcap_ng (I tested removing libcap_ng, it failed).

Without this change, virt-viewer cannot be used with guests machines
that uses SPICE.
Diffstat (limited to 'pkgs/applications/virtualization/virt-viewer/default.nix')
-rw-r--r--pkgs/applications/virtualization/virt-viewer/default.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index b49bd40136f3..af1bd6533a91 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,8 +1,11 @@
 { 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
+, 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 {
@@ -24,7 +27,7 @@ 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;
+  ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ];
 
   meta = {
     description = "A viewer for remote virtual machines";