diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 992d797c189..70d61bc4deb 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3479ba9b8f8..a1799aad1e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };