Merge branch 'staging'

2016-06-22 10:49:56 +02:00
parent f073df60d6 ebf1cb28a2
commit c05d829598
51 changed files with 431 additions and 200 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 .
  '';