summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorMoritz Ulrich <moritz@tarn-vedra.de>2016-05-18 12:40:35 +0200
committerMoritz Ulrich <moritz@tarn-vedra.de>2016-05-18 12:56:48 +0200
commit29644950d4786eb2bc9b28719b6ce0e652077675 (patch)
treefff49a4bd51b4ae62b23473d2d8dc1fa08f55f9e /pkgs/top-level
parent0431fe6194061f894821778051ce64dc94df2ef1 (diff)
downloadnixlib-29644950d4786eb2bc9b28719b6ce0e652077675.tar
nixlib-29644950d4786eb2bc9b28719b6ce0e652077675.tar.gz
nixlib-29644950d4786eb2bc9b28719b6ce0e652077675.tar.bz2
nixlib-29644950d4786eb2bc9b28719b6ce0e652077675.tar.lz
nixlib-29644950d4786eb2bc9b28719b6ce0e652077675.tar.xz
nixlib-29644950d4786eb2bc9b28719b6ce0e652077675.tar.zst
nixlib-29644950d4786eb2bc9b28719b6ce0e652077675.zip
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.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a31834d0542f..f15c65b0ff59 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 { };