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
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -11,9 +11,8 @@ stdenv.mkDerivation rec {
    sha256 = "03fl2wgbc1cilaw8hrhfqjsbpi05cid6k4cr3s2vmv5gx0dnrgy4";
  };

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