summary refs log tree commit diff
path: root/pkgs/build-support/build-fhs-userenv-bubblewrap
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-08-07 03:20:36 +0000
committerJonathan Ringer <jonringer117@gmail.com>2022-06-14 22:13:43 -0700
commitd6915ebb3f5011bc66b88a591b267b71ff884525 (patch)
tree0b9029beb74099ca1a1bbe316fbc907c3f53e2b3 /pkgs/build-support/build-fhs-userenv-bubblewrap
parent81ccb11016c0e333f6158ec6af965a47c37e5055 (diff)
downloadnixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.tar
nixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.tar.gz
nixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.tar.bz2
nixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.tar.lz
nixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.tar.xz
nixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.tar.zst
nixpkgs-d6915ebb3f5011bc66b88a591b267b71ff884525.zip
buildFHSUserEnvBubblewrap: allow for non-x86 platforms
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv-bubblewrap')
-rw-r--r--pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix6
1 files 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 945b9287ed0..b934f44da90 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