JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2720 from aristidb/master

Browse Source 
fhs-chrootenv (steam): support directly using users other than root, fix sound support, fix /run/user
This commit is contained in:
Sander van der Burg 2014-05-23 11:41:14 +02:00
commit 7cdeb712c3
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/build-fhs-chrootenv/default.nix
View File

@ -1,11 +1,11 @@
{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2,
bashInteractive, xz, shadow, gawk, less, su, buildEnv}:
bashInteractive, xz, shadow, gawk, less, buildEnv}:
{name, pkgs ? [], profile ? ""}:
let
basePkgs = [
glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
gzip bzip2 bashInteractive xz shadow gawk less su
gzip bzip2 bashInteractive xz shadow gawk less
];
# Compose a global profile for the chroot environment

2
pkgs/build-support/build-fhs-chrootenv/load.sh.in
View File

@ -3,4 +3,4 @@
chrootenvDest=/run/chrootenv/@name@
# Enter the LFS chroot environment
chroot $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="/root" PATH="/bin:/sbin" /bin/bash --login
sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDest /usr/bin/env -i PS1="$PS1" TERM="$TERM" DISPLAY="$DISPLAY" HOME="$HOME" PATH="/bin:/sbin" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" /bin/bash --login

2
pkgs/build-support/build-fhs-chrootenv/mount.sh.in
View File

@ -17,7 +17,7 @@ mount --bind /home $chrootenvDest/home
# Bind mount state directories
mount --bind /var $chrootenvDest/var
mount --bind /run $chrootenvDest/run
mount --rbind /run $chrootenvDest/run
# Bind mount the host system's /etc
mount --bind /etc $chrootenvDest/host-etc

4
pkgs/build-support/build-fhs-chrootenv/umount.sh.in
View File

@ -2,5 +2,5 @@
chrootenvDest=/run/chrootenv/@name@
# Unmount all bind mounts
umount $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}
# Unmount all (r)bind mounts
umount -l $chrootenvDest/{dev/pts,dev/shm,dev,nix/store,proc,sys,host-etc,home,var,run}

2
pkgs/top-level/all-packages.nix
View File

@ -270,7 +270,7 @@ let
buildFHSChrootEnv = import ../build-support/build-fhs-chrootenv {
inherit stdenv glibc glibcLocales gcc coreutils diffutils findutils;
inherit gnused gnugrep gnutar gzip bzip2 bashInteractive xz shadow gawk;
inherit less su buildEnv;
inherit less buildEnv;
};
dotnetenv = import ../build-support/dotnetenv {