diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-23 09:25:10 +0200 |
commit | aa9a04883e34f6a7b89846e87654577d5b218f46 (patch) | |
tree | 5bc2d586532b76c0248a9e3280ec7e333ef6d893 /pkgs/applications/science/robotics | |
parent | 21f9180d49d1d911668620f3d8897c1e1352672a (diff) | |
download | nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.gz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.bz2 nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.lz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.xz nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.tar.zst nixlib-aa9a04883e34f6a7b89846e87654577d5b218f46.zip |
Revert "Merge branch 'staging'" due to glibc
The main output started to retain dependency on bootstrap-tools; see https://github.com/NixOS/nixpkgs/pull/15867#issuecomment-227949096 This reverts commit c05d8295988697adbb920a7b4a999ae3670c5504, reversing changes made to f073df60d60444c30c49cb26d6b187a4100b41fe.
Diffstat (limited to 'pkgs/applications/science/robotics')
-rw-r--r-- | pkgs/applications/science/robotics/qgroundcontrol/default.nix | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 81f5accd4780..1e33a1be8567 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -27,11 +27,6 @@ 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 |