rr: bump version, 64bit support

The git version of `rr` recently got 64bit support; bump version and
pick out a working git revision for the new builds.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2014-12-04 17:24:04 -06:00
parent aadb556e29
commit 12a3db89ba
1 changed files with 16 additions and 12 deletions

View File

@ -1,18 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: { stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.0"; name = "rr-${version}";
name = "rr-${version}"; version = "2.0.0-f2b02c4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla"; owner = "mozilla";
repo = "rr"; repo = "rr";
rev = version; rev = "f2b02c4144584dec092d10eb42be2396069ea546";
sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; sha256 = "1vdhgh3bp287z21lxfj3rb9r3fbar18n9pl0v31h8axjn57l70h7";
}; };
buildInputs = [ cmake libpfm zlib ]; buildInputs = [ cmake libpfm zlib python ];
cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; cmakeFlags =
"-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="
+ (optionalString (stdenv.system == "x86_64-linux") " -Dforce64bit=ON");
meta = { meta = {
homepage = http://rr-project.org/; homepage = http://rr-project.org/;
@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
time the same execution is replayed. time the same execution is replayed.
''; '';
license = "custom"; license = "custom";
maintainers = [ stdenv.lib.maintainers.pierron ]; maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
platforms = [ "i686-linux" ]; platforms = stdenv.lib.platforms.linux;
}; };
} }