This reverts commit840f2e0ac5
, reversing changes made tod3ed0402e5
. This breaks appimage which puts args into the runScript and we don't provide a good way to pass thru additional args. The actual bug was in nix-alien which should escape paths; providing a valid runScript is the responsibility of the caller.
245 lines
6.9 KiB
Nix
245 lines
6.9 KiB
Nix
{ lib
|
|
, stdenv
|
|
, callPackage
|
|
, runCommandLocal
|
|
, writeShellScript
|
|
, glibc
|
|
, pkgsi686Linux
|
|
, coreutils
|
|
, bubblewrap
|
|
}:
|
|
|
|
{ name ? null
|
|
, pname ? null
|
|
, version ? null
|
|
, runScript ? "bash"
|
|
, extraInstallCommands ? ""
|
|
, meta ? {}
|
|
, passthru ? {}
|
|
, extraBwrapArgs ? []
|
|
, unshareUser ? true
|
|
, unshareIpc ? true
|
|
, unsharePid ? true
|
|
, unshareNet ? false
|
|
, unshareUts ? true
|
|
, unshareCgroup ? true
|
|
, dieWithParent ? true
|
|
, ...
|
|
} @ args:
|
|
|
|
assert (pname != null || version != null) -> (name == null && pname != null); # You must declare either a name or pname + version (preferred).
|
|
|
|
with builtins;
|
|
let
|
|
pname = if args.name != null then args.name else args.pname;
|
|
versionStr = lib.optionalString (version != null) ("-" + version);
|
|
name = pname + versionStr;
|
|
|
|
buildFHSEnv = callPackage ./buildFHSEnv.nix { };
|
|
|
|
fhsenv = buildFHSEnv (removeAttrs (args // { inherit name; }) [
|
|
"runScript" "extraInstallCommands" "meta" "passthru" "extraBwrapArgs" "dieWithParent"
|
|
"unshareUser" "unshareCgroup" "unshareUts" "unshareNet" "unsharePid" "unshareIpc"
|
|
"pname" "version"
|
|
]);
|
|
|
|
etcBindEntries = let
|
|
files = [
|
|
# NixOS Compatibility
|
|
"static"
|
|
"nix" # mainly for nixUnstable users, but also for access to nix/netrc
|
|
# Shells
|
|
"shells"
|
|
"bashrc"
|
|
"zshenv"
|
|
"zshrc"
|
|
"zinputrc"
|
|
"zprofile"
|
|
# Users, Groups, NSS
|
|
"passwd"
|
|
"group"
|
|
"shadow"
|
|
"hosts"
|
|
"resolv.conf"
|
|
"nsswitch.conf"
|
|
# User profiles
|
|
"profiles"
|
|
# Sudo & Su
|
|
"login.defs"
|
|
"sudoers"
|
|
"sudoers.d"
|
|
# Time
|
|
"localtime"
|
|
"zoneinfo"
|
|
# Other Core Stuff
|
|
"machine-id"
|
|
"os-release"
|
|
# PAM
|
|
"pam.d"
|
|
# Fonts
|
|
"fonts"
|
|
# ALSA
|
|
"alsa"
|
|
"asound.conf"
|
|
# SSL
|
|
"ssl/certs"
|
|
"ca-certificates"
|
|
"pki"
|
|
];
|
|
in map (path: "/etc/${path}") files;
|
|
|
|
# Create this on the fly instead of linking from /nix
|
|
# The container might have to modify it and re-run ldconfig if there are
|
|
# issues running some binary with LD_LIBRARY_PATH
|
|
createLdConfCache = ''
|
|
cat > /etc/ld.so.conf <<EOF
|
|
/lib
|
|
/lib/x86_64-linux-gnu
|
|
/lib64
|
|
/usr/lib
|
|
/usr/lib/x86_64-linux-gnu
|
|
/usr/lib64
|
|
/lib/i386-linux-gnu
|
|
/lib32
|
|
/usr/lib/i386-linux-gnu
|
|
/usr/lib32
|
|
/run/opengl-driver/lib
|
|
/run/opengl-driver-32/lib
|
|
EOF
|
|
ldconfig &> /dev/null
|
|
'';
|
|
init = run: writeShellScript "${name}-init" ''
|
|
source /etc/profile
|
|
${createLdConfCache}
|
|
exec ${run} "$@"
|
|
'';
|
|
|
|
indentLines = str: lib.concatLines (map (s: " " + s) (filter (s: s != "") (lib.splitString "\n" str)));
|
|
bwrapCmd = { initArgs ? "" }: ''
|
|
ignored=(/nix /dev /proc /etc)
|
|
ro_mounts=()
|
|
symlinks=()
|
|
etc_ignored=()
|
|
for i in ${fhsenv}/*; do
|
|
path="/''${i##*/}"
|
|
if [[ $path == '/etc' ]]; then
|
|
:
|
|
elif [[ -L $i ]]; then
|
|
symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$path")
|
|
ignored+=("$path")
|
|
else
|
|
ro_mounts+=(--ro-bind "$i" "$path")
|
|
ignored+=("$path")
|
|
fi
|
|
done
|
|
|
|
if [[ -d ${fhsenv}/etc ]]; then
|
|
for i in ${fhsenv}/etc/*; do
|
|
path="/''${i##*/}"
|
|
# NOTE: we're binding /etc/fonts and /etc/ssl/certs from the host so we
|
|
# don't want to override it with a path from the FHS environment.
|
|
if [[ $path == '/fonts' || $path == '/ssl' ]]; then
|
|
continue
|
|
fi
|
|
ro_mounts+=(--ro-bind "$i" "/etc$path")
|
|
etc_ignored+=("/etc$path")
|
|
done
|
|
fi
|
|
|
|
for i in ${lib.escapeShellArgs etcBindEntries}; do
|
|
if [[ "''${etc_ignored[@]}" =~ "$i" ]]; then
|
|
continue
|
|
fi
|
|
if [[ -L $i ]]; then
|
|
symlinks+=(--symlink "$(${coreutils}/bin/readlink "$i")" "$i")
|
|
else
|
|
ro_mounts+=(--ro-bind-try "$i" "$i")
|
|
fi
|
|
done
|
|
|
|
declare -a auto_mounts
|
|
# loop through all directories in the root
|
|
for dir in /*; do
|
|
# if it is a directory and it is not ignored
|
|
if [[ -d "$dir" ]] && [[ ! "''${ignored[@]}" =~ "$dir" ]]; then
|
|
# add it to the mount list
|
|
auto_mounts+=(--bind "$dir" "$dir")
|
|
fi
|
|
done
|
|
|
|
declare -a x11_args
|
|
# Always mount a tmpfs on /tmp/.X11-unix
|
|
# Rationale: https://github.com/flatpak/flatpak/blob/be2de97e862e5ca223da40a895e54e7bf24dbfb9/common/flatpak-run.c#L277
|
|
x11_args+=(--tmpfs /tmp/.X11-unix)
|
|
|
|
# Try to guess X socket path. This doesn't cover _everything_, but it covers some things.
|
|
if [[ "$DISPLAY" == :* ]]; then
|
|
display_nr=''${DISPLAY#?}
|
|
local_socket=/tmp/.X11-unix/X$display_nr
|
|
x11_args+=(--ro-bind-try "$local_socket" "$local_socket")
|
|
fi
|
|
|
|
cmd=(
|
|
${bubblewrap}/bin/bwrap
|
|
--dev-bind /dev /dev
|
|
--proc /proc
|
|
--chdir "$(pwd)"
|
|
${lib.optionalString unshareUser "--unshare-user"}
|
|
${lib.optionalString unshareIpc "--unshare-ipc"}
|
|
${lib.optionalString unsharePid "--unshare-pid"}
|
|
${lib.optionalString unshareNet "--unshare-net"}
|
|
${lib.optionalString unshareUts "--unshare-uts"}
|
|
${lib.optionalString unshareCgroup "--unshare-cgroup"}
|
|
${lib.optionalString dieWithParent "--die-with-parent"}
|
|
--ro-bind /nix /nix
|
|
# Our glibc will look for the cache in its own path in `/nix/store`.
|
|
# As such, we need a cache to exist there, because pressure-vessel
|
|
# depends on the existence of an ld cache. However, adding one
|
|
# globally proved to be a bad idea (see #100655), the solution we
|
|
# settled on being mounting one via bwrap.
|
|
# Also, the cache needs to go to both 32 and 64 bit glibcs, for games
|
|
# of both architectures to work.
|
|
--tmpfs ${glibc}/etc \
|
|
--symlink /etc/ld.so.conf ${glibc}/etc/ld.so.conf \
|
|
--symlink /etc/ld.so.cache ${glibc}/etc/ld.so.cache \
|
|
--ro-bind ${glibc}/etc/rpc ${glibc}/etc/rpc \
|
|
--remount-ro ${glibc}/etc \
|
|
'' + lib.optionalString (stdenv.isx86_64 && stdenv.isLinux) (indentLines ''
|
|
--tmpfs ${pkgsi686Linux.glibc}/etc \
|
|
--symlink /etc/ld.so.conf ${pkgsi686Linux.glibc}/etc/ld.so.conf \
|
|
--symlink /etc/ld.so.cache ${pkgsi686Linux.glibc}/etc/ld.so.cache \
|
|
--ro-bind ${pkgsi686Linux.glibc}/etc/rpc ${pkgsi686Linux.glibc}/etc/rpc \
|
|
--remount-ro ${pkgsi686Linux.glibc}/etc \
|
|
'') + ''
|
|
"''${ro_mounts[@]}"
|
|
"''${symlinks[@]}"
|
|
"''${auto_mounts[@]}"
|
|
"''${x11_args[@]}"
|
|
${concatStringsSep "\n " extraBwrapArgs}
|
|
${init runScript} ${initArgs}
|
|
)
|
|
exec "''${cmd[@]}"
|
|
'';
|
|
|
|
bin = writeShellScript "${name}-bwrap" (bwrapCmd { initArgs = ''"$@"''; });
|
|
in runCommandLocal name {
|
|
inherit meta;
|
|
|
|
passthru = passthru // {
|
|
env = runCommandLocal "${name}-shell-env" {
|
|
shellHook = bwrapCmd {};
|
|
} ''
|
|
echo >&2 ""
|
|
echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
|
|
echo >&2 ""
|
|
exit 1
|
|
'';
|
|
inherit args fhsenv;
|
|
};
|
|
} ''
|
|
mkdir -p $out/bin
|
|
ln -s ${bin} $out/bin/${pname}
|
|
|
|
${extraInstallCommands}
|
|
''
|