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
@@ -11,8 +11,9 @@ stdenv.mkDerivation rec {
    sha256 = "03fl2wgbc1cilaw8hrhfqjsbpi05cid6k4cr3s2vmv5gx0dnrgy4";
  };

-  patchPhase = ''
+  postPatch = ''
    substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
+    sed '7i#include <math.h>' -i src/Scheduler.cc
    patchShebangs .
  '';