From 65de42b9ccb3958e2f85784a650438f52f1cc503 Mon Sep 17 00:00:00 2001 From: André Silva Date: Tue, 26 Jan 2021 00:41:01 +0000 Subject: build-fhs-userenv-bubblewrap: remove unused variable --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index 9a9e5a9ce10a..d47f21bc3641 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 -- cgit 1.4.1 From fe49d856b0a0d1bd9a6571beaa897535e7c09d5c Mon Sep 17 00:00:00 2001 From: André Silva Date: Tue, 26 Jan 2021 00:41:50 +0000 Subject: build-fhs-userenv: bind /etc/profiles --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 2 ++ pkgs/build-support/build-fhs-userenv/env.nix | 3 +++ 2 files changed, 5 insertions(+) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index d47f21bc3641..a5637acbf276 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -35,6 +35,8 @@ let "hosts" "resolv.conf" "nsswitch.conf" + # User profiles + "profiles" # Sudo & Su "login.defs" "sudoers" 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 -- cgit 1.4.1 From 34fae590bf80c2502a36e2573d57eb0827563090 Mon Sep 17 00:00:00 2001 From: André Silva Date: Tue, 26 Jan 2021 00:42:32 +0000 Subject: build-fhs-userenv-bubblewrap: don't bind /etc/fonts from fhs environment --- pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs/build-support') diff --git a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index a5637acbf276..6592621570ce 100644 --- a/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -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 -- cgit 1.4.1