Unverified Commit 5bffe8d9 authored by Gavin John's avatar Gavin John
Browse files

qgroundcontrol: switch to using libsForQt5

parent 4c6a6032

pkgs/by-name/qg/qgroundcontrol/package.nix

+9 −19
Original line number Diff line number Diff line
@@ -3,28 +3,17 @@ 
  stdenv,

  fetchFromGitHub,

  SDL2,

  qtbase,

  qtcharts,

  qtlocation,

  qtserialport,

  qtsvg,

  qtquickcontrols2,

  qtgraphicaleffects,

  qtspeech,

  qtx11extras,

  qmake,

  qttools,

  libsForQt5,

  gst_all_1,

  wayland,

  pkg-config,

  wrapQtAppsHook,

}:



stdenv.mkDerivation rec {

  pname = "qgroundcontrol";

  version = "4.4.2";



  propagatedBuildInputs = [

  propagatedBuildInputs = with libsForQt5; [

    qtbase

    qtcharts

    qtlocation
@@ -46,12 +35,13 @@ stdenv.mkDerivation rec { 
  ];



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

  nativeBuildInputs = [

    pkg-config

  nativeBuildInputs =

    [ pkg-config ]

    ++ (with libsForQt5; [

      qmake

      qttools

      wrapQtAppsHook

  ];

    ]);



  preConfigure = ''

    mkdir build

pkgs/top-level/all-packages.nix

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














  wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };



























  qgroundcontrol = libsForQt5.callPackage ../by-name/qg/qgroundcontrol/package.nix { };



























  qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };





























  qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };