pyrox.dev
Merge pull request #132047 from Mic92/build-fhs-userenv
build-fhs-userenv: fix defaults on aarch64
authored by Jörg Thalheim and committed by GitHub 0c093cc4 00486ec9
+8
-4
pkgs/build-support/build-fhs-userenv/env.nix
+8
-4
pkgs/build-support/build-fhs-userenv/env.nix
···
1
1
{ stdenv, buildEnv, writeText, pkgs, pkgsi686Linux }:
2
2
3
-
{ name, profile ? ""
4
-
, targetPkgs ? pkgs: [], multiPkgs ? pkgs: []
5
-
, extraBuildCommands ? "", extraBuildCommandsMulti ? ""
3
+
{ name
4
+
, profile ? ""
5
+
, targetPkgs ? pkgs: []
6
+
, multiPkgs ? pkgs: []
7
+
, extraBuildCommands ? ""
8
+
, extraBuildCommandsMulti ? ""
6
9
, extraOutputsToInstall ? []
7
10
}:
8
11
···
23
26
24
27
let
25
28
is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64;
26
-
isMultiBuild = multiPkgs != null && is64Bit;
29
+
# multi-lib glibc is only supported on x86_64
30
+
isMultiBuild = multiPkgs != null && stdenv.hostPlatform.system == "x86_64-linux";
27
31
isTargetBuild = !isMultiBuild;
28
32
29
33
# list of packages (usually programs) which are only be installed for the