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 c05d829598, reversing changes made to f073df60d6.
2016-06-23 09:25:10 +02:00
parent 21f9180d49
commit aa9a04883e
51 changed files with 201 additions and 432 deletions
@@ -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