Merge pull request #313122 from romildo/upd.qterminal

lxqt.{qtermwidget,qterminal}:  1.4.0 -> 2.0.0

pkgs/desktops/lxqt/default.nix

@@ -30,10 +30,7 @@ let
     lxqt-sudo = callPackage ./lxqt-sudo {};
     lxqt-themes = callPackage ./lxqt-themes {};
     pavucontrol-qt = callPackage ./pavucontrol-qt {};
-    qtermwidget = callPackage ./qtermwidget {
-      lxqt-build-tools = lxqt-build-tools_0_13;
-      inherit (pkgs.libsForQt5) qtbase qttools;
-    };
+    qtermwidget = callPackage ./qtermwidget {};
 
     ### CORE 2
     lxqt-panel = callPackage ./lxqt-panel {};
@@ -41,10 +38,7 @@ let
     pcmanfm-qt = callPackage ./pcmanfm-qt {};
 
     ### OPTIONAL
-    qterminal = callPackage ./qterminal {
-      lxqt-build-tools = lxqt-build-tools_0_13;
-      inherit (pkgs.libsForQt5) qtbase qttools qtx11extras;
-    };
+    qterminal = callPackage ./qterminal {};
     compton-conf = callPackage ./compton-conf {
       lxqt-build-tools = lxqt-build-tools_0_13;
       inherit (pkgs.libsForQt5) qtbase qttools qtx11extras;

pkgs/desktops/lxqt/qterminal/default.nix

@@ -6,7 +6,6 @@
 , qtbase
 , qtermwidget
 , qttools
-, qtx11extras
 , wrapQtAppsHook
 , gitUpdater
 , nixosTests
@@ -14,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "1.4.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-nojNx351lYw0jVKEvzAIDP1WrZWcCAlfYMxNG95GcEo=";
+    hash = "sha256-SesKJCiMoiqkvMM29+0IMERozQ9zuD+NJTtaC6j7ubM=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +32,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase
     qtermwidget
-    qtx11extras
   ];
 
   passthru.updateScript = gitUpdater { };

pkgs/desktops/lxqt/qtermwidget/default.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtermwidget";
-  version = "1.4.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    hash = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
+    hash = "sha256-kZS6D/wSJFRt/+Afq0zCCmNnJPpFT+1hd4zVPc+rJsE=";
   };
 
   nativeBuildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     broken = stdenv.isDarwin;
     homepage = "https://github.com/lxqt/qtermwidget";
-    description = "A terminal emulator widget for Qt 5";
+    description = "A terminal emulator widget for Qt, used by QTerminal";
     license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     maintainers = teams.lxqt.members;