nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 04:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

qgroundcontrol: some small improvements (#339867)

Browse Source
This commit is contained in:
lassulus 2024-09-15 09:43:18 +01:00 committed by GitHub
commit 948d8eafbe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkgs/applications/science/robotics/qgroundcontrol/default.nix → pkgs/by-name/qg/qgroundcontrol/package.nix
View File

@ -1,14 +1,28 @@
{ lib, stdenv, fetchFromGitHub, SDL2, qtbase, qtcharts, qtlocation, qtserialport {
, qtsvg, qtquickcontrols2, qtgraphicaleffects, qtspeech, qtx11extras, qmake lib,
, qttools, gst_all_1, wayland, pkg-config, wrapQtAppsHook }: stdenv,
fetchFromGitHub,
SDL2,
libsForQt5,
gst_all_1,
wayland,
pkg-config,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qgroundcontrol"; pname = "qgroundcontrol";
version = "4.4.2"; version = "4.4.2";
propagatedBuildInputs = [ propagatedBuildInputs = with libsForQt5; [
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 qtbase
qtgraphicaleffects qtspeech qtx11extras qtcharts
qtlocation
qtserialport
qtsvg
qtquickcontrols2
qtgraphicaleffects
qtspeech
qtx11extras
]; ];
gstInputs = with gst_all_1; [ gstInputs = with gst_all_1; [
@ -21,7 +35,13 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs; buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;
nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ]; nativeBuildInputs =
[ pkg-config ]
++ (with libsForQt5; [
qmake
qttools
wrapQtAppsHook
]);
preConfigure = '' preConfigure = ''
mkdir build mkdir build
@ -65,18 +85,22 @@ stdenv.mkDerivation rec {
# TODO: package mavlink so we can build from a normal source tarball # TODO: package mavlink so we can build from a normal source tarball
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mavlink"; owner = "mavlink";
repo = pname; repo = "qgroundcontrol";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg="; hash = "sha256-2Bc4uC/2e+PTsvFZ4RjnTzkOiBO9vsYHeLPkcwpDRrg=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta = with lib; { meta = {
description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks";
homepage = "http://qgroundcontrol.com/"; homepage = "https://qgroundcontrol.com/";
license = licenses.gpl3Plus; changelog = "https://github.com/mavlink/qgroundcontrol/blob/master/ChangeLog.md";
platforms = platforms.linux; license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ lopsided98 pandapip1 ]; platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
lopsided98
pandapip1
];
mainProgram = "QGroundControl"; mainProgram = "QGroundControl";
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -32765,8 +32765,6 @@ with pkgs;
wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { }; wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
qgroundcontrol = libsForQt5.callPackage ../applications/science/robotics/qgroundcontrol { };
qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { }; qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };