From 12a3db89ba68ff8f142477e729694fb91fed85c5 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 4 Dec 2014 17:24:04 -0600 Subject: [PATCH] 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 --- .../development/tools/analysis/rr/default.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index c2ab7a334fe8..f297d0951027 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: + +with stdenv.lib; stdenv.mkDerivation rec { - version = "2.0.0"; - name = "rr-${version}"; + name = "rr-${version}"; + version = "2.0.0-f2b02c4"; src = fetchFromGitHub { - owner = "mozilla"; - repo = "rr"; - rev = version; - sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; + owner = "mozilla"; + repo = "rr"; + rev = "f2b02c4144584dec092d10eb42be2396069ea546"; + sha256 = "1vdhgh3bp287z21lxfj3rb9r3fbar18n9pl0v31h8axjn57l70h7"; }; - buildInputs = [ cmake libpfm zlib ]; - cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; + buildInputs = [ cmake libpfm zlib python ]; + cmakeFlags = + "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING=" + + (optionalString (stdenv.system == "x86_64-linux") " -Dforce64bit=ON"); meta = { homepage = http://rr-project.org/; @@ -24,8 +28,8 @@ stdenv.mkDerivation rec { time the same execution is replayed. ''; - license = "custom"; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = [ "i686-linux" ]; + license = "custom"; + maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; }; } \ No newline at end of file