diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-22 10:49:56 +0200 |
| commit | c05d8295988697adbb920a7b4a999ae3670c5504 (patch) | |
| tree | 7a5526cffad30206f814560c72f13829e4d9c396 /pkgs/applications/science/robotics | |
| parent | f073df60d60444c30c49cb26d6b187a4100b41fe (diff) | |
| parent | ebf1cb28a2a9e4ef3bcdf15376af4618a1e652c7 (diff) | |
| download | nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.tar nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.tar.gz nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.tar.bz2 nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.tar.lz nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.tar.xz nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.tar.zst nixpkgs-c05d8295988697adbb920a7b4a999ae3670c5504.zip | |
Merge branch 'staging'
Diffstat (limited to 'pkgs/applications/science/robotics')
| -rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 1e33a1be856..81f5accd478 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -27,6 +27,11 @@ stdenv.mkDerivation rec { ] ++ qtInputs; patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ]; + postPatch = '' + sed '1i#include <cmath>' -i src/Vehicle/Vehicle.cc \ + -i src/comm/{QGCFlightGearLink,QGCJSBSimLink}.cc \ + -i src/{uas/UAS,ui/QGCDataPlot2D}.cc + ''; preConfigure = '' mkdir build |