summary refs log tree commit diff
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2023-02-03 16:30:04 +0100
committerAtemu <atemu.main@gmail.com>2023-02-04 15:13:31 +0100
commitd397b090626b21a2f84aa594d6e550479bf1b09d (patch)
tree23697c5a5b0e0cd28f86123d032a447e4b7f0328
parent4d7c2644dbac9cf8282c0afe68fca8f0f3e7b2db (diff)
downloadnixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.tar
nixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.tar.gz
nixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.tar.bz2
nixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.tar.lz
nixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.tar.xz
nixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.tar.zst
nixpkgs-d397b090626b21a2f84aa594d6e550479bf1b09d.zip
virt-viewer: disable ovirtSupport
-rw-r--r--pkgs/applications/virtualization/virt-viewer/default.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index 2e8aa34286a..58948c8f80b 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -11,6 +11,12 @@
 , intltool
 , libcap ? null
 , libgovirt
+  # Currently unsupported. According to upstream, libgovirt is for a very narrow
+  # use-case and we don't currently cover it in Nixpkgs. It's safe to disable.
+  # https://gitlab.com/virt-viewer/virt-viewer/-/issues/100#note_1265011223
+  # Can be enabled again once this is merged:
+  # https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/129
+, ovirtSupport ? false
 , libvirt
 , libvirt-glib
 , libxml2
@@ -71,11 +77,12 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk-vnc
     gtk3
-    libgovirt
     libvirt
     libvirt-glib
     libxml2
     vte
+  ] ++ optionals ovirtSupport [
+    libgovirt
   ] ++ optionals spiceSupport ([
     gdbm
     spice-gtk_libsoup2
@@ -87,6 +94,10 @@ stdenv.mkDerivation rec {
   # Required for USB redirection PolicyKit rules file
   propagatedUserEnvPkgs = optional spiceSupport spice-gtk_libsoup2;
 
+  mesonFlags = [
+    (lib.mesonEnable "ovirt" ovirtSupport)
+  ];
+
   strictDeps = true;
 
   postPatch = ''