qgroundcontrol: some small improvements (#339867)

Changed files
+37 -15
pkgs
by-name
qg
qgroundcontrol
top-level
+37 -13
pkgs/applications/science/robotics/qgroundcontrol/default.nix pkgs/by-name/qg/qgroundcontrol/package.nix
···
-
{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport
-
, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake
-
, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }:
+
{
+
lib,
+
stdenv,
+
fetchFromGitHub,
+
SDL2,
+
libsForQt5,
+
gst_all_1,
+
wayland,
+
pkg-config,
+
}:
stdenv.mkDerivation rec {
pname = "qgroundcontrol";
version = "4.4.2";
-
propagatedBuildInputs = [
-
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
-
qtgraphicaleffects qtspeech qtx11extras
+
propagatedBuildInputs = with libsForQt5; [
+
qtbase
+
qtcharts
+
qtlocation
+
qtserialport
+
qtsvg
+
qtquickcontrols2
+
qtgraphicaleffects
+
qtspeech
+
qtx11extras
];
gstInputs = with gst_all_1; [
···
];
buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;
-
nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ];
+
nativeBuildInputs =
+
[ pkg-config ]
+
++ (with libsForQt5; [
+
qmake
+
qttools
+
wrapQtAppsHook
+
]);
preConfigure = ''
mkdir build
···
# TODO: package mavlink so we can build from a normal source tarball
src = fetchFromGitHub {
owner = "mavlink";
-
repo = pname;
+
repo = "qgroundcontrol";
rev = "v${version}";
hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg=";
fetchSubmodules = true;
};
-
meta = with lib; {
+
meta = {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
-
homepage = "http://qgroundcontrol.com/";
-
license = licenses.gpl3Plus;
-
platforms = platforms.linux;
-
maintainers = with maintainers; [ lopsided98 pandapip1 ];
+
homepage = "https://qgroundcontrol.com/";
+
changelog = "https://github.com/mavlink/qgroundcontrol/blob/master/ChangeLog.md";
+
license = lib.licenses.gpl3Plus;
+
platforms = lib.platforms.linux;
+
maintainers = with lib.maintainers; [
+
lopsided98
+
pandapip1
+
];
mainProgram = "QGroundControl";
};
}
-2
pkgs/top-level/all-packages.nix
···
wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
-
qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { };
-
qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };