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

rr: Only build native architecture.

Browse Source 
rr wants to build itself with 32+64bit support on 64bit systems, but
this fails in recent NixOS versions as it can't find libstdc++.so.6 at
runtime.

This patch disables 32bit builds on 64bit. To debug 32bit binaries,
pkgsi686Linux.rr can be used.
This commit is contained in:
Moritz Ulrich 2016-05-18 12:40:35 +02:00
parent 0431fe6194
commit 29644950d4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,11 @@ stdenv.mkDerivation rec {
'';
buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ];
cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING=";
cmakeFlags = [
"-DCMAKE_C_FLAGS_RELEASE:STRING="
"-DCMAKE_CXX_FLAGS_RELEASE:STRING="
"-Ddisable32bit=ON"
];
enableParallelBuilding = true;

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

@ -6360,9 +6360,7 @@ in
rolespec = callPackage ../development/tools/misc/rolespec { };
rr = callPackage ../development/tools/analysis/rr {
stdenv = stdenv_32bit;
};
rr = callPackage ../development/tools/analysis/rr { };
saleae-logic = callPackage ../development/tools/misc/saleae-logic { };