Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cc77604c8d8c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d04355d877e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 20, 2019

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

    * qgroundcontrol: 3.3.0 -> 3.5.4, fix build

* qgroundcontrol: 3.5.4 -> 3.5.5
    @lopsided98 @c0bw3b
    lopsided98 authored and c0bw3b committed Oct 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    delroth Pierre Bourdon
    GPG key ID: 6FB80DCD84DA0F1C
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8d04355 View commit details
Showing with 12 additions and 13 deletions.
  1. +12 −13 pkgs/applications/science/robotics/qgroundcontrol/default.nix
25 changes: 12 additions & 13 deletions pkgs/applications/science/robotics/qgroundcontrol/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{ stdenv, fetchgit, git, SDL2, udev, doxygen
, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake, qtspeech
{ lib, mkDerivation, fetchgit, SDL2
, qtbase, qtcharts, qtlocation, qtserialport, qtsvg, qtquickcontrols2
, qtgraphicaleffects, qtspeech, qmake
, makeWrapper
, gst_all_1, pkgconfig
}:

stdenv.mkDerivation rec {
mkDerivation rec {
pname = "qgroundcontrol";
version = "3.3.0";
version = "3.5.5";

qtInputs = [
qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
qtquick1 qtquickcontrols qtgraphicaleffects qtspeech
qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2
qtgraphicaleffects qtspeech
];

gstInputs = with gst_all_1; [
gstreamer gst-plugins-base
];

enableParallelBuilding = true;
buildInputs = [ SDL2 udev doxygen git ] ++ gstInputs ++ qtInputs;
buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs;
nativeBuildInputs = [ pkgconfig makeWrapper qmake ];

preConfigure = ''
@@ -58,17 +58,16 @@ stdenv.mkDerivation rec {
# TODO: package mavlink so we can build from a normal source tarball
src = fetchgit {
url = "https://github.com/mavlink/qgroundcontrol.git";
rev = "refs/tags/v${version}";
sha256 = "0abjm0wywp24qlgg9w8g35ijprjg5csq4fgba9caaiwvmpfbhmpw";
rev = "v${version}";
sha256 = "05zy6w9lwwh254wa8c6wysa67kk0flywcvipii9b1rmy47slflhs";
fetchSubmodules = true;
};

meta = with stdenv.lib; {
meta = with lib; {
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;
platforms = platforms.linux;
maintainers = with maintainers; [ pxc ];
broken = true;
};
}