diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-18 00:02:31 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 00:02:31 +0000 |
| commit | 87085e3d627bff460b85b0fa06dfa6b2546ef2bb (patch) | |
| tree | f8984c7c0891abb1f2abcd25e0fb5d21ccea058d /pkgs/build-support | |
| parent | 7b5c82c5181edfeace5e83f6889bbcc196f871b4 (diff) | |
| parent | 3e43b5e4bc1d80da0a39bf0155357d9bd4495cae (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 925dfc8bfbe2d..7ebcba73708c2 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 @@ -139,7 +141,7 @@ let setupLibDirsTarget = '' # link content of targetPaths cp -rsHf ${staticUsrProfileTarget}/lib lib - ln -s lib lib${if is64Bit then "64" else "32"} + ln -s lib lib${if is64bit then "64" else "32"} ''; # setup /lib, /lib32 and /lib64 |