rr: 3.0.0 -> 4.0.0

This commit is contained in:
Ricardo M. Correia 2015-10-28 15:20:32 +01:00
parent c4325afeed
commit 3136a17834
2 changed files with 15 additions and 11 deletions

View file

@ -1,29 +1,31 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }:
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps }:
stdenv.mkDerivation rec {
version = "3.0.0";
version = "4.0.0";
name = "rr-${version}";
src = fetchFromGitHub {
owner = "mozilla";
repo = "rr";
rev = version;
sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg";
sha256 = "02njg9riziyvgp0q39lhpyf32p1hjjk1wih5dvl74wrzy5anhbwk";
};
patchPhase = ''
substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE'
''
# On 64bit machines, don't build the 32-bit components for debugging
# 32-bit binaries. This sucks but I don't know how to make 'gcc' cooperate
# easily with how CMake works to build 32 and 64bit binaries at once.
+ stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
substituteInPlace CMakeLists.txt --replace 'if(rr_64BIT)' 'if(false)'
patchShebangs .
'';
buildInputs = [ cmake libpfm zlib python ];
buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps ];
cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING=";
enableParallelBuilding = true;
# FIXME
#doCheck = true;
preCheck = "export HOME=$TMPDIR";
meta = {
homepage = http://rr-project.org/;
description = "Records nondeterministic executions and debugs them deterministically";

View file

@ -5779,7 +5779,9 @@ let
rman = callPackage ../development/tools/misc/rman { };
rr = callPackage ../development/tools/analysis/rr { };
rr = callPackage ../development/tools/analysis/rr {
stdenv = stdenv_32bit;
};
saleae-logic = callPackage ../development/tools/misc/saleae-logic { };