Unverified Commit 0c093cc4 authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #132047 from Mic92/build-fhs-userenv 

build-fhs-userenv: fix defaults on aarch64
parents 00486ec9 c145ac7e

pkgs/build-support/build-fhs-userenv/env.nix

+8 −4
Original line number Diff line number Diff line 
{ 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