qgroundcontrol: switch to using libsForQt5

This commit is contained in:
Gavin John 2024-09-05 12:01:16 -07:00
parent 4c6a603295
commit 5bffe8d9b5
No known key found for this signature in database
GPG Key ID: 792E158CDD33C3EE
2 changed files with 9 additions and 21 deletions

View File

@ -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
nativeBuildInputs =
[ pkg-config ]
++ (with libsForQt5; [
qmake
qttools
wrapQtAppsHook
];
]);
preConfigure = ''
mkdir build

View File

@ -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 { };