From cd11c4bba3b17d3c7b1eb339f49be2ea759bbe8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 27 Jul 2024 20:21:13 +0200 Subject: [PATCH] buildFHSEnv: replace all chroot occurences with generic names Co-authored-by: Atemu --- .../build-fhsenv-bubblewrap/buildFHSEnv.nix | 10 +++++----- 1 file 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 ffd19cfd4a8a..c00aff0b2288 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix @@ -51,7 +51,7 @@ let # list of packages which are for x86 (only multiPkgs, only for x86_64 hosts) multiPaths = multiPkgs pkgsi686Linux; - # base packages of the chroot + # base packages of the fhsenv # 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. @@ -84,7 +84,7 @@ let ''; etcProfile = writeText "profile" '' - export PS1='${name}-chrootenv:\u@\h:\w\$ ' + export PS1='${name}-fhsenv:\u@\h:\w\$ ' export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" @@ -123,8 +123,8 @@ let ${profile} ''; - # Compose /etc for the chroot environment - etcPkg = runCommandLocal "${name}-chrootenv-etc" { } '' + # Compose /etc for the fhs environment + etcPkg = runCommandLocal "${name}-fhs-etc" { } '' mkdir -p $out/etc pushd $out/etc @@ -215,7 +215,7 @@ let then setupLibDirsTarget else setupLibDirsMulti; - # the target profile is the actual profile that will be used for the chroot + # the target profile is the actual profile that will be used for the fhs setupTargetProfile = '' mkdir -m0755 usr pushd usr