lol

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

Signed-off-by: Austin Seipp <aseipp@pobox.com>

+18 -8
+17 -7
pkgs/development/tools/analysis/rr/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, libpfm, zlib }: 1 + { stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "2.0.0"; 4 + version = "3.0.0"; 5 5 name = "rr-${version}"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "mozilla"; 9 9 repo = "rr"; 10 10 rev = version; 11 - sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; 11 + sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg"; 12 12 }; 13 13 14 - buildInputs = [ cmake libpfm zlib ]; 14 + patchPhase = '' 15 + substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' 16 + '' 17 + # On 64bit machines, don't build the 32-bit components for debugging 18 + # 32-bit binaries. This sucks but I don't know how to make 'gcc' cooperate 19 + # easily with how CMake works to build 32 and 64bit binaries at once. 20 + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' 21 + substituteInPlace CMakeLists.txt --replace 'if(rr_64BIT)' 'if(false)' 22 + ''; 23 + 24 + buildInputs = [ cmake libpfm zlib python ]; 15 25 cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; 16 26 17 27 meta = { ··· 25 35 ''; 26 36 27 37 license = "custom"; 28 - maintainers = [ stdenv.lib.maintainers.pierron ]; 29 - platforms = [ "i686-linux" ]; 38 + maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; 39 + platforms = stdenv.lib.platforms.linux; 30 40 }; 31 - } 41 + }
+1 -1
pkgs/top-level/all-packages.nix
··· 4699 4699 4700 4700 remake = callPackage ../development/tools/build-managers/remake { }; 4701 4701 4702 - rr = callPackage_i686 ../development/tools/analysis/rr { }; 4702 + rr = callPackage ../development/tools/analysis/rr { }; 4703 4703 4704 4704 saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; 4705 4705