diff options
| author | Kevin Cox <kevincox@kevincox.ca> | 2021-02-03 09:56:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 09:56:14 -0500 |
| commit | ab5a9d5746c910ceb9b60193bf135510c3f32010 (patch) | |
| tree | 7817a104445a439473e481010bd93662564b20e6 /pkgs/build-support | |
| parent | e90e1147d1aad7a7bac626c86eb5a0a97c1a873f (diff) | |
| parent | 34fae590bf80c2502a36e2573d57eb0827563090 (diff) | |
| download | nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.tar nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.tar.gz nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.tar.bz2 nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.tar.lz nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.tar.xz nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.tar.zst nixlib-ab5a9d5746c910ceb9b60193bf135510c3f32010.zip | |
Merge pull request #110825 from andresilva/appimage-fixes
build-fhs-userenv: fixes for mount points
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/build-support/build-fhs-userenv/env.nix | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 9a9e5a9ce10a..6592621570ce 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -24,8 +24,6 @@ let "unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc" ]); - chrootenv = callPackage ./chrootenv {}; - etcBindFlags = let files = [ # NixOS Compatibility @@ -37,6 +35,8 @@ let "hosts" "resolv.conf" "nsswitch.conf" + # User profiles + "profiles" # Sudo & Su "login.defs" "sudoers" @@ -80,6 +80,11 @@ let if [[ -d ${env}/etc ]]; then for i in ${env}/etc/*; do path="/''${i##*/}" + # NOTE: we're binding /etc/fonts from the host so we don't want to + # override it with a path from the FHS environment. + if [[ $path == '/fonts' ]]; then + continue + fi ro_mounts+=(--ro-bind "$i" "/etc$path") done fi diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 083e7617b502..89b567a249f6 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -89,6 +89,9 @@ let ln -s /host/etc/resolv.conf resolv.conf ln -s /host/etc/nsswitch.conf nsswitch.conf + # symlink user profiles + ln -s /host/etc/profiles profiles + # symlink sudo and su stuff ln -s /host/etc/login.defs login.defs ln -s /host/etc/sudoers sudoers |