diff options
author | Atemu <atemu.main@gmail.com> | 2023-09-24 11:41:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-24 11:41:22 +0200 |
commit | aa827460ae6ca3b1d4f2e30d9b1c468f92554476 (patch) | |
tree | 56c70e1b0e6e97f9d78a686203e5aecc04605214 /pkgs/build-support | |
parent | c497931955af2ac89c77a0776bd07e8c8b410f4a (diff) | |
parent | 00a28d0ed92631b16a17275099c78e25d80d74a6 (diff) |
Merge pull request #257049 from alyssais/buildFHSEnv-passthru
buildFHSEnv: add base paths to passthru
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix index 2c0c4a3d513a9..a6802f4ab544d 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -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 |