virtmanager-qt: 0.45.75 -> 0.48.79

NixOS · Jan 6, 2018 · 7e8e582 · 7e8e582
1 parent eddf30c
commit 7e8e582
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,27 +1,27 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
 , qtbase, qtmultimedia, qtsvg
-, lxqt, libvncserver, libvirt, pcre, pixman, spice_gtk, spice_protocol
+, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol
 }:
 
 mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.45.75";
+  version = "0.48.79";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "1s59g7kkz8481y8yyf89f549xwbg1978zj9ds61iy94mwz80b38n";
+    sha256 = "1mzncca9blc742vb77gyfza0sd1rby3qy5yl4x19nkllid92jn6k";
   };
 
   cmakeFlags = [
     "-DBUILD_QT_VERSION=5"
+    "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5"
   ];
 
   buildInputs = [
-    # virt-manager-qt currently does not compile with qtermwidget-0.8.0
-    qtbase qtmultimedia qtsvg lxqt.qtermwidget_0_7_1
-    libvirt libvncserver pixman spice_gtk spice_protocol
+    qtbase qtmultimedia qtsvg
+    libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol
   ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -38,5 +38,6 @@ mkDerivation rec {
     '';
     license     = licenses.gpl2;
     maintainers = with maintainers; [ peterhoeg ];
+    inherit (qtbase.meta) platforms;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -17367,7 +17367,9 @@ with pkgs;
     system-libvirt = libvirt;
   };
 
-  virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { };
+  virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
+    qtermwidget = lxqt.qtermwidget;
+  };
 
   virtinst = callPackage ../applications/virtualization/virtinst {};