BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qgroundcontrol: 3.3.0 -> 3.5.5, fix build (#71308)

Browse source 
* qgroundcontrol: 3.3.0 -> 3.5.4, fix build

* qgroundcontrol: 3.5.4 -> 3.5.5
This commit is contained in:
Ben Wolsieffer 2019-10-20 13:27:23 -04:00 committed by Renaud
parent cc77604c8d
commit 8d04355d87
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkgs/applications/science/robotics/qgroundcontrol/default.nix
View file

@ -1,17 +1,17 @@
{ stdenv, fetchgit, git, SDL2, udev, doxygen { lib, mkDerivation, fetchgit, SDL2
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns , qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech , qtgraphicaleffects, qtspeech, qmake
, makeWrapper , makeWrapper
, gst_all_1, pkgconfig , gst_all_1, pkgconfig
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
pname = "qgroundcontrol"; pname = "qgroundcontrol";
version = "3.3.0"; version = "3.5.5";
qtInputs = [ qtInputs = [
qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
qtquick1 qtquickcontrols qtgraphicaleffects qtspeech qtgraphicaleffects qtspeech
]; ];
gstInputs = with gst_all_1; [ gstInputs = with gst_all_1; [
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkgconfig makeWrapper qmake ]; nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
preConfigure = '' preConfigure = ''
@ -58,17 +58,16 @@ 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 = fetchgit { src = fetchgit {
url = "https://github.com/mavlink/qgroundcontrol.git"; url = "https://github.com/mavlink/qgroundcontrol.git";
rev = "refs/tags/v${version}"; rev = "v${version}";
sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw"; sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs";
fetchSubmodules = true; fetchSubmodules = true;
}; };
meta = with stdenv.lib; { meta = with lib; {
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.org/; homepage = "http://qgroundcontrol.org/";
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ pxc ]; maintainers = with maintainers; [ pxc ];
broken = true;
}; };
} }