From 5bffe8d9b592aa371880714f746a0de5c0d924cc Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Thu, 5 Sep 2024 12:01:16 -0700
Subject: [PATCH] qgroundcontrol: switch to using libsForQt5

---
 pkgs/by-name/qg/qgroundcontrol/package.nix | 28 +++++++---------------
 pkgs/top-level/all-packages.nix            |  2 --
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/qg/qgroundcontrol/package.nix b/pkgs/by-name/qg/qgroundcontrol/package.nix
index abaf015764aa..b27e6bb51b4a 100644
--- a/pkgs/by-name/qg/qgroundcontrol/package.nix
+++ b/pkgs/by-name/qg/qgroundcontrol/package.nix
@@ -3,28 +3,17 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
-  qtbase,
-  qtcharts,
-  qtlocation,
-  qtserialport,
-  qtsvg,
-  qtquickcontrols2,
-  qtgraphicaleffects,
-  qtspeech,
-  qtx11extras,
-  qmake,
-  qttools,
+  libsForQt5,
   gst_all_1,
   wayland,
   pkg-config,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
   pname = "qgroundcontrol";
   version = "4.4.2";
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with libsForQt5; [
     qtbase
     qtcharts
     qtlocation
@@ -46,12 +35,13 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;
-  nativeBuildInputs = [
-    pkg-config
-    qmake
-    qttools
-    wrapQtAppsHook
-  ];
+  nativeBuildInputs =
+    [ pkg-config ]
+    ++ (with libsForQt5; [
+      qmake
+      qttools
+      wrapQtAppsHook
+    ]);
 
   preConfigure = ''
     mkdir build
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 00b0bd079710..facc5b1fb2ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32787,8 +32787,6 @@ with pkgs;
 
   wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
 
-  qgroundcontrol = libsForQt5.callPackage ../by-name/qg/qgroundcontrol/package.nix { };
-
   qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 
   qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };