Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-15 14:41:01 +00:00
parent 0761573507 f402c6321a
commit 5185bc1773
1603 changed files with 132258 additions and 39568 deletions
@@ -18,6 +18,10 @@ stdenv.mkDerivation {

  hardeningDisable = [ "pic" ];

+  postPatch = ''
+    sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
+  '';
+
  cmakeFlags = [
    "-DUSE_BUNDLED_DEPS=OFF"
  ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";