From 3009f1882839a5c967e5c18b8b84c3c5407b29a9 Mon Sep 17 00:00:00 2001 From: Yuxuan Shui Date: Sat, 13 Jun 2026 11:30:30 +0100 Subject: [PATCH] rr: only enable 32-bit support on x86_64 i686 libraries cannot be built on ARM systems, but are required to enable 32-bit support. Supersedes #531138 --- pkgs/development/tools/analysis/rr/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 2aabf266e193..4a86304b1986 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,6 +1,7 @@ { lib, gccMultiStdenv, + stdenv, fetchFromGitHub, fetchpatch, bash, @@ -17,8 +18,10 @@ zlib, zstd, }: - -gccMultiStdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.hostPlatform.isx86_64 then gccMultiStdenv else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { version = "5.9.0"; pname = "rr"; @@ -77,7 +80,7 @@ gccMultiStdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "disable32bit" false) + (lib.cmakeBool "disable32bit" (!stdenv.hostPlatform.isx86_64)) (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ];