public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "rr: bump version, 64bit support"

Browse Source 
This reverts commit 12a3db89ba68ff8f142477e729694fb91fed85c5.

The prior commit was broken a bit; rr will take a little more work to
support a 64bit build.
This commit is contained in:
Austin Seipp 2014-12-04 17:49:13 -06:00
parent 22dfaefea5
commit 73651e6c01
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/development/tools/analysis/rr/default.nix
View File

@ -1,22 +1,18 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: { stdenv, fetchFromGitHub, cmake, libpfm, zlib }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rr-${version}"; version = "2.0.0";
version = "2.0.0-f2b02c4"; name = "rr-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla"; owner = "mozilla";
repo = "rr"; repo = "rr";
rev = "f2b02c4144584dec092d10eb42be2396069ea546"; rev = version;
sha256 = "1vdhgh3bp287z21lxfj3rb9r3fbar18n9pl0v31h8axjn57l70h7"; sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s";
}; };
buildInputs = [ cmake libpfm zlib python ]; buildInputs = [ cmake libpfm zlib ];
cmakeFlags = cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING=";
"-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/;
@ -28,8 +24,8 @@ stdenv.mkDerivation rec {
time the same execution is replayed. time the same execution is replayed.
''; '';
license = "custom"; license = "custom";
maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; maintainers = [ stdenv.lib.maintainers.pierron ];
platforms = stdenv.lib.platforms.linux; platforms = [ "i686-linux" ];
}; };
} }