Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e90e1147d1aa
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ab5a9d5746c9
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 26, 2021

  1. build-fhs-userenv-bubblewrap: remove unused variable

    @andresilva
    andresilva committed Jan 26, 2021
    Copy the full SHA
    65de42b View commit details

  2. build-fhs-userenv: bind /etc/profiles

    @andresilva
    andresilva committed Jan 26, 2021
    Copy the full SHA
    fe49d85 View commit details

  3. build-fhs-userenv-bubblewrap: don't bind /etc/fonts from fhs environment

    @andresilva
    andresilva committed Jan 26, 2021
    Copy the full SHA
    34fae59 View commit details

Commits on Feb 3, 2021

  1. Merge pull request #110825 from andresilva/appimage-fixes 

    build-fhs-userenv: fixes for mount points
    @kevincox
    kevincox authored Feb 3, 2021
    Copy the full SHA
    ab5a9d5 View commit details
Showing with 10 additions and 2 deletions.
  1. +7 −2 pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
  2. +3 −0 pkgs/build-support/build-fhs-userenv/env.nix
9 changes: 7 additions & 2 deletions pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions pkgs/build-support/build-fhs-userenv/env.nix
View file
Original file line number Diff line number Diff line change
@@ -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