From 29644950d4786eb2bc9b28719b6ce0e652077675 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 18 May 2016 12:40:35 +0200 Subject: [PATCH] rr: Only build native architecture. 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. --- pkgs/development/tools/analysis/rr/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index ea733b5b461..926aaeb94cc 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a31834d0542..f15c65b0ff5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };