build-fhs-userenv: fix defaults on aarch64
This commit is contained in:
parent
bed52081e5
commit
c145ac7eab
|
@ -1,8 +1,11 @@
|
||||||
{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
|
{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
|
||||||
|
|
||||||
{ name, profile ? ""
|
{ name
|
||||||
, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
|
, profile ? ""
|
||||||
, extraBuildCommands ? "", extraBuildCommandsMulti ? ""
|
, targetPkgs ? pkgs: []
|
||||||
|
, multiPkgs ? pkgs: []
|
||||||
|
, extraBuildCommands ? ""
|
||||||
|
, extraBuildCommandsMulti ? ""
|
||||||
, extraOutputsToInstall ? []
|
, extraOutputsToInstall ? []
|
||||||
}:
|
}:
|
||||||
|
|
||||||
|
@ -23,7 +26,8 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64;
|
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;
|
isTargetBuild = !isMultiBuild;
|
||||||
|
|
||||||
# list of packages (usually programs) which are only be installed for the
|
# list of packages (usually programs) which are only be installed for the
|
||||||
|
|
Loading…
Reference in a new issue