Unverified Commit 948d8eaf authored by lassulus's avatar lassulus Committed by GitHub
Browse files

qgroundcontrol: some small improvements (#339867)

parents 91a63aee 5bffe8d9

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

+37 −13
Original line number Diff line number Diff line 
{ 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; [
@@ -21,7 +35,13 @@ stdenv.mkDerivation rec { 
  ];



  buildInputs = [ SDL2 ] ++ gstInputs ++ propagatedBuildInputs;

  nativeBuildInputs = [ pkg-config qmake qttools wrapQtAppsHook ];

  nativeBuildInputs =

    [ pkg-config ]

    ++ (with libsForQt5; [

      qmake

      qttools

      wrapQtAppsHook

    ]);



  preConfigure = ''

    mkdir build
@@ -65,18 +85,22 @@ stdenv.mkDerivation rec { 
  # 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";

  };

}

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -32765,8 +32765,6 @@ with pkgs; 














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