Merge pull request #57650 from stephengroat/patch-4

apmplanner2: fix build
2019-03-14 15:28:57 -04:00
parent fc48a70f7b 08e4d7cf69
commit d5f97ae600
2 changed files with 2 additions and 1 deletions
--- 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";
--- 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