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

Move su to the base packages of chrootenv builder

Browse Source
This commit is contained in:
Sander van der Burg 2014-04-18 13:30:24 +02:00
parent 5a03d5b3a9
commit 104c841c85
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,12 @@
{stdenv, glibc, glibcLocales, gcc, coreutils, diffutils, findutils, gnused, gnugrep, gnutar, gzip, bzip2,
bashInteractive, xz, shadow, gawk, less, buildEnv}:
bashInteractive, xz, shadow, gawk, less, su, buildEnv}:
{name, pkgs ? [], profile ? ""}:
let
basePkgs = [ glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar gzip bzip2
bashInteractive xz shadow gawk less ];
basePkgs = [
glibc glibcLocales gcc coreutils diffutils findutils gnused gnugrep gnutar
gzip bzip2 bashInteractive xz shadow gawk less su
];
# Compose a global profile for the chroot environment
profilePkg = stdenv.mkDerivation {
@ -31,16 +33,16 @@ bashInteractive xz shadow gawk less ];
mountSh = ./mount.sh.in;
loadSh = ./load.sh.in;
umountSh = ./umount.sh.in;
destroySh = ./destroy.sh.in;
in
stdenv.mkDerivation {
name = "${name}-chrootenv";
buildCommand = ''
mkdir -p $out/sw
cd $out/sw
for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var}
do
destroySh = ./destroy.sh.in;
in
stdenv.mkDerivation {
name = "${name}-chrootenv";
buildCommand = ''
mkdir -p $out/sw
cd $out/sw
for i in ${staticUsrProfile}/{etc,bin,lib{,32,64},sbin,var}
do
if [ -x "$i" ]
then
ln -s "$i"

4
pkgs/games/steam/chrootenv.nix
View File

@ -1,10 +1,10 @@
{ buildFHSChrootEnv, steam
, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib, su
, xterm, libX11, zenity, python, mesa, xdg_utils, dbus_tools, alsaLib
}:
buildFHSChrootEnv {
name = "steam";
pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib su ];
pkgs = [ steam xterm libX11 zenity python mesa xdg_utils dbus_tools alsaLib ];
profile = ''
export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib
export FONTCONFIG_FILE=/etc/fonts/fonts.conf

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 buildEnv;
inherit less su buildEnv;
};
dotnetenv = import ../build-support/dotnetenv {