public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #66871 from peterhoeg/f/apmplanner

Browse Source 
apmplanner2: fix build against qt 5.12
This commit is contained in:
Marek Mahut 2019-08-19 11:43:40 +02:00 committed by GitHub
commit 22aa7eadf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/science/robotics/apmplanner2/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchFromGitHub, qmake { lib, mkDerivation, fetchFromGitHub, fetchpatch, qmake
, qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2 , qtbase, qtscript, qtwebkit, qtserialport, qtsvg, qtdeclarative, qtquickcontrols2
, alsaLib, libsndfile, flite, openssl, udev, SDL2 , alsaLib, libsndfile, flite, openssl, udev, SDL2
}: }:
stdenv.mkDerivation rec { mkDerivation rec {
name = "apmplanner2-${version}"; pname = "apmplanner2";
# TODO revert Qt511 to Qt5 in pkgs/top-level/all-packages.nix on next release
version = "2.0.27-rc1"; version = "2.0.27-rc1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ArduPilot"; owner = "ArduPilot";
repo = "apm_planner"; repo = "apm_planner";
@ -14,11 +14,19 @@ stdenv.mkDerivation rec {
sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd"; sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
}; };
qtInputs = [ patches = [
# can be dropped after 2.0.27-rc1
(fetchpatch {
url = "https://github.com/ArduPilot/apm_planner/commit/299ff23b5e9910de04edfc06b6893bb06b47a57b.patch";
sha256 = "16rc81iwqp2i46g6bm9lbvcjfsk83999r9h8w1pz0mys7rsilvqy";
})
];
buildInputs = [
alsaLib libsndfile flite openssl udev SDL2
qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2 qtbase qtscript qtwebkit qtserialport qtsvg qtdeclarative qtquickcontrols2
]; ];
buildInputs = [ alsaLib libsndfile flite openssl udev SDL2 ] ++ qtInputs;
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
qmakeFlags = [ "apm_planner.pro" ]; qmakeFlags = [ "apm_planner.pro" ];
@ -29,7 +37,7 @@ stdenv.mkDerivation rec {
substituteInPlace $out/share/applications/apmplanner2.desktop \ substituteInPlace $out/share/applications/apmplanner2.desktop \
--replace /usr $out --replace /usr $out
''; '';
enableParallelBuilding = true; enableParallelBuilding = true;
meta = { meta = {
@ -39,7 +47,7 @@ stdenv.mkDerivation rec {
Includes support for the APM and PX4 based controllers. Includes support for the APM and PX4 based controllers.
''; '';
homepage = http://ardupilot.org/planner2/; homepage = http://ardupilot.org/planner2/;
license = stdenv.lib.licenses.gpl3; license = lib.licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.wucke13 ]; maintainers = with lib.maintainers; [ wucke13 ];
}; };
} }

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

@ -23519,7 +23519,7 @@ in
### SCIENCE/ROBOTICS ### SCIENCE/ROBOTICS
apmplanner2 = libsForQt511.callPackage ../applications/science/robotics/apmplanner2 { }; apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { };
betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { };