Merge pull request #90320 from wucke13/apmplanner-2

apmplanner2: 2.0.27-rc1 -> 2.0.28-rc1
This commit is contained in:
Benjamin Hipple 2020-07-05 20:23:52 -04:00 committed by GitHub
commit 4f4e0477b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5,23 +5,15 @@
mkDerivation rec {
pname = "apmplanner2";
version = "2.0.27-rc1";
version = "2.0.28-rc1";
src = fetchFromGitHub {
owner = "ArduPilot";
repo = "apm_planner";
rev = version;
sha256 = "1k0786mjzi49nb6yw4chh9l4dmkf9gybpxg9zqkr5yg019nyzcvd";
sha256 = "18yn8bdz5hmgb0m5hlk8bibz4cj4g25w75pm1rvc4ds0mr1qgyjd";
};
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
@ -35,7 +27,7 @@ mkDerivation rec {
preFixup = ''
ln --relative --symbolic $out/share/APMPlanner2/* $out/bin/
substituteInPlace $out/share/applications/apmplanner2.desktop \
--replace /usr $out
--replace /usr $out
'';
enableParallelBuilding = true;