From d6915ebb3f5011bc66b88a591b267b71ff884525 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 7 Aug 2021 03:20:36 +0000 Subject: [PATCH] buildFHSUserEnvBubblewrap: allow for non-x86 platforms --- pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 945b9287ed00..b934f44da90b 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -22,8 +22,10 @@ # /lib will link to /lib32 let - is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; - isMultiBuild = multiPkgs != null && is64Bit; + inherit (stdenv) is64Bit; + + # use of glibc_multi is only supported on x86_64-linux + isMultiBuild = multiPkgs != null && stdenv.isx86_64 && stdenv.isLinux; isTargetBuild = !isMultiBuild; # list of packages (usually programs) which are only be installed for the