From 08e4d7cf69e7ed00c8359a3c5da1abf03f102b3b Mon Sep 17 00:00:00 2001 From: Stephen Date: Thu, 14 Mar 2019 10:26:32 -0700 Subject: [PATCH] apmplanner2: fix build see ArduPilot/apm_planner#1166 --- pkgs/applications/science/robotics/apmplanner2/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 2d579a803698..761766ffdf0d 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -5,6 +5,7 @@ stdenv.mkDerivation rec { name = "apmplanner2-${version}"; + # TODO revert Qt59 to Qt5 in pkgs/top-level/all-packages.nix on next release version = "2.0.26"; src = fetchFromGitHub { owner = "ArduPilot"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 161450de4da1..7deb9bd84b1f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22259,7 +22259,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt59.callPackage ../applications/science/robotics/apmplanner2 { }; ### MISC