diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2021-07-30 11:17:19 +0200 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2021-07-30 11:23:37 +0200 |
| commit | c145ac7eabd6bae0f4d85002ab5e2079b2d9621a (patch) | |
| tree | fc490b4633ec02df9a27b1c908c2ba07714de7f0 /pkgs/build-support | |
| parent | bed52081e58807a23fcb2df38a3f865a2f37834e (diff) | |
| download | nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.tar nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.tar.gz nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.tar.bz2 nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.tar.lz nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.tar.xz nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.tar.zst nixpkgs-c145ac7eabd6bae0f4d85002ab5e2079b2d9621a.zip | |
build-fhs-userenv: fix defaults on aarch64
Diffstat (limited to 'pkgs/build-support')
| -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 |