diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 840ada805d75..103d0a3f4fbb 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, fetchpatch, cmake, pkg-config +{ mkDerivation, lib, fetchFromGitHub, cmake, pkg-config , qtbase, qtmultimedia, qtsvg, qttools, krdc , libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol , libselinux, libsepol, util-linux @@ -6,13 +6,13 @@ mkDerivation rec { pname = "virt-manager-qt"; - version = "0.72.97"; + version = "0.72.99"; src = fetchFromGitHub { owner = "F1ash"; repo = "qt-virt-manager"; rev = version; - sha256 = "0b2bx7ah35glcsiv186sc9cqdrkhg1vs9jz036k9byk61np0cb1i"; + hash = "sha256-1aXlGlK+YPOe2X51xycWvSu8YC9uCywyL6ItiScFA04="; }; cmakeFlags = [ @@ -20,14 +20,6 @@ mkDerivation rec { "-DQTERMWIDGET_INCLUDE_DIRS=${qtermwidget}/include/qtermwidget5" ]; - patches = [ - (fetchpatch { - # drop with next update - url = "https://github.com/F1ash/qt-virt-manager/commit/0d338b037ef58c376d468c1cd4521a34ea181edd.patch"; - sha256 = "1wjqyc5wsnxfwwjzgqjr9hcqhd867amwhjd712qyvpvz8x7p2s24"; - }) - ]; - buildInputs = [ qtbase qtmultimedia qtsvg krdc libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 8418652dbc38..3efd526cb6bd 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -75,6 +75,11 @@ let libfm-qt = libfm-qt_1_4; inherit (pkgs.libsForQt5) qtbase qtsvg qttools libdbusmenu; }; + qtermwidget_1_4 = callPackage ./qtermwidget { + version = "1.4.0"; + lxqt-build-tools = lxqt-build-tools_0_13; + inherit (pkgs.libsForQt5) qtbase qttools; + }; preRequisitePackages = [ kdePackages.kwindowsystem # provides some QT plugins needed by lxqt-panel diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 35c5b2c3f641..fb0c63460df1 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -7,17 +7,21 @@ , lxqt-build-tools , wrapQtAppsHook , gitUpdater +, version ? "2.0.0" }: stdenv.mkDerivation rec { pname = "qtermwidget"; - version = "2.0.0"; + inherit version; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - hash = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE="; + hash = { + "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU="; + "2.0.0" = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE="; + }."${version}"; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b64b692d6a32..9a23cccbcd12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35172,7 +35172,7 @@ with pkgs; }; virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { - qtermwidget = lxqt.qtermwidget; + qtermwidget = lxqt.qtermwidget_1_4; }; virtscreen = callPackage ../tools/admin/virtscreen { };