diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-07-30 18:19:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-30 18:19:54 +0100 |
| commit | 0c093cc4284bba91bfed58fba6706b77f2b875cf (patch) | |
| tree | 794be42e11723309659e90ad61329026badf0419 | |
| parent | 00486ec99e7b5692d3b0cf554097f5e482d163bf (diff) | |
| parent | c145ac7eabd6bae0f4d85002ab5e2079b2d9621a (diff) | |
| download | nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.tar nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.tar.gz nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.tar.bz2 nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.tar.lz nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.tar.xz nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.tar.zst nixpkgs-0c093cc4284bba91bfed58fba6706b77f2b875cf.zip | |
Merge pull request #132047 from Mic92/build-fhs-userenv
build-fhs-userenv: fix defaults on aarch64
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 226904f311b..da4521b4de3 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -1,8 +1,11 @@ { stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }: -{ name, profile ? "" -, targetPkgs ? pkgs: [], multiPkgs ? pkgs: [] -, extraBuildCommands ? "", extraBuildCommandsMulti ? "" +{ name +, profile ? "" +, targetPkgs ? pkgs: [] +, multiPkgs ? pkgs: [] +, extraBuildCommands ? "" +, extraBuildCommandsMulti ? "" , extraOutputsToInstall ? [] }: @@ -23,7 +26,8 @@ let is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; - isMultiBuild = multiPkgs != null && is64Bit; + # multi-lib glibc is only supported on x86_64 + isMultiBuild = multiPkgs != null && stdenv.hostPlatform.system == "x86_64-linux"; isTargetBuild = !isMultiBuild; # list of packages (usually programs) which are only be installed for the |