b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

buildFHSEnv: add base paths to passthru

Browse source 
It's useful to be able to introspect all packages which are available
in the fhsenv.  I've renamed basePkgs and baseMultiPkgs to be
consistent with the naming scheme used for the bits that were
previously public — names ending in "Pkgs" are for functions, and
names ending in "Paths" are the results of those functions.
This commit is contained in:
Alyssa Ross 2023-09-24 08:41:26 +00:00
parent 59cffc64b6
commit 00a28d0ed9
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
View file

@ -52,7 +52,7 @@ let
# these match the host's architecture, glibc_multi is used for multilib
# builds. glibcLocales must be before glibc or glibc_multi as otherwiese
# the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available.
basePkgs = with pkgs; [
baseTargetPaths = with pkgs; [
glibcLocales
(if isMultiBuild then glibc_multi else glibc)
(toString gcc.cc.lib)
@ -71,7 +71,7 @@ let
bzip2
xz
];
baseMultiPkgs = with pkgsi686Linux; [
baseMultiPaths = with pkgsi686Linux; [
(toString gcc.cc.lib)
];
@ -132,7 +132,7 @@ let
staticUsrProfileTarget = buildEnv {
name = "${name}-usr-target";
# ldconfig wrapper must come first so it overrides the original ldconfig
paths = [ etcPkg ldconfig ] ++ basePkgs ++ targetPaths;
paths = [ etcPkg ldconfig ] ++ baseTargetPaths ++ targetPaths;
extraOutputsToInstall = [ "out" "lib" "bin" ] ++ extraOutputsToInstall;
ignoreCollisions = true;
postBuild = ''
@ -168,7 +168,7 @@ let
staticUsrProfileMulti = buildEnv {
name = "${name}-usr-multi";
paths = baseMultiPkgs ++ multiPaths;
paths = baseMultiPaths ++ multiPaths;
extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall;
ignoreCollisions = true;
};
@ -251,7 +251,7 @@ let
in runCommandLocal "${name}-fhs" {
passthru = {
inherit args multiPaths targetPaths ldconfig;
inherit args baseTargetPaths targetPaths baseMultiPaths multiPaths ldconfig;
};
} ''
mkdir -p $out