dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

buildFHSEnv: add multiArch flag

Browse Source 
The intention is to allow the user control over whether 32bit deps are supposed
to be included in the fhsenv
This commit is contained in:
Atemu 2023-07-01 06:36:05 +02:00
parent 167264179b
commit 62b2adc753
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/builders/special/fhs-environments.section.md
View File

@ -11,6 +11,8 @@ Accepted arguments are:
Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed. Packages to be installed for the main host's architecture (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also installed.
- `multiPkgs` - `multiPkgs`
Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default. Packages to be installed for all architectures supported by a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are installed by default.
- `multiArch`
Whether to install 32bit multiPkgs into the FHSEnv in 64bit environments
- `extraBuildCommands` - `extraBuildCommands`
Additional commands to be executed for finalizing the directory structure. Additional commands to be executed for finalizing the directory structure.
- `extraBuildCommandsMulti` - `extraBuildCommandsMulti`

5
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View File

@ -12,6 +12,7 @@
, profile ? "" , profile ? ""
, targetPkgs ? pkgs: [] , targetPkgs ? pkgs: []
, multiPkgs ? pkgs: [] , multiPkgs ? pkgs: []
, multiArch ? true # Whether to include 32bit packages
, extraBuildCommands ? "" , extraBuildCommands ? ""
, extraBuildCommandsMulti ? "" , extraBuildCommandsMulti ? ""
, extraOutputsToInstall ? [] , extraOutputsToInstall ? []
@ -35,8 +36,8 @@
let let
inherit (stdenv) is64bit; inherit (stdenv) is64bit;
# use of glibc_multi is only supported on x86_64-linux # "use of glibc_multi is only supported on x86_64-linux"
isMultiBuild = stdenv.system == "x86_64-linux"; isMultiBuild = multiArch && stdenv.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