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

nixpkgs: rr 2.0.0 -> 3.0.0, with 64bit support

Browse Source 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2014-12-12 01:19:50 -06:00
parent 614ea25952
commit 0bdff430a4
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,17 +1,27 @@
{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: { stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.0.0"; version = "3.0.0";
name = "rr-${version}"; name = "rr-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mozilla"; owner = "mozilla";
repo = "rr"; repo = "rr";
rev = version; rev = version;
sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg";
}; };
buildInputs = [ cmake libpfm zlib ]; 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)'
'';
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=";
meta = { meta = {
@ -25,7 +35,7 @@ stdenv.mkDerivation rec {
''; '';
license = "custom"; license = "custom";
maintainers = [ stdenv.lib.maintainers.pierron ]; maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
platforms = [ "i686-linux" ]; platforms = stdenv.lib.platforms.linux;
}; };
} }

2
pkgs/top-level/all-packages.nix
View File

@ -4699,7 +4699,7 @@ let
remake = callPackage ../development/tools/build-managers/remake { }; remake = callPackage ../development/tools/build-managers/remake { };
rr = callPackage_i686 ../development/tools/analysis/rr { }; rr = callPackage ../development/tools/analysis/rr { };
saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { };