ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-11 15:27:20 +03:00
Code Issues Projects Releases Wiki Activity

buildFHSUserEnv: add .env support

Browse Source
This commit is contained in:
Nikolay Amiantov 2015-08-26 19:37:48 +03:00
parent 9635f89fff
commit 47ea8c097c
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/build-support/build-fhs-userenv/default.nix
View File

@ -1,4 +1,4 @@
{ writeText, writeScriptBin, stdenv, ruby } : { env, runScript } : { runCommand, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash" } :
let let
name = env.pname; name = env.pname;
@ -9,21 +9,37 @@ let
${builtins.readFile ./chroot-user.rb} ${builtins.readFile ./chroot-user.rb}
''; '';
init = writeText "init" '' init = run: writeText "${name}-init" ''
# Make /tmp directory # Make /tmp directory
mkdir -m 1777 /tmp mkdir -m 1777 /tmp
# Expose sockets in /tmp # Expose sockets in /tmp
for i in /host-tmp/.*-unix; do for i in /host-tmp/.*-unix; do
ln -s "$i" "/tmp/$(basename "$i")" ln -s "$i" "/tmp/$(basename "$i")"
done done
[ -d "$1" ] && [ -r "$1" ] && cd "$1" [ -d "$1" ] && [ -r "$1" ] && cd "$1"
shift shift
exec "${runScript}" "$@" exec ${run} "$@"
''; '';
in writeScriptBin name '' in runCommand name {
passthru.env =
runCommand "${name}-shell-env" {
shellHook = ''
exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
'';
} ''
echo >&2 ""
echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
echo >&2 ""
exit 1
'';
} ''
mkdir -p $out/bin
cat <<EOF >$out/bin/${name}
#! ${stdenv.shell} #! ${stdenv.shell}
exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init} "$(pwd)" "$@" exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@"
EOF
chmod +x $out/bin/${name}
'' ''

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

@ -296,7 +296,7 @@ let
buildFHSUserEnv = args: userFHSEnv { buildFHSUserEnv = args: userFHSEnv {
env = buildFHSEnv (removeAttrs args [ "runScript" ]); env = buildFHSEnv (removeAttrs args [ "runScript" ]);
runScript = args.runScript; runScript = args.runScript or "bash";
}; };
buildMaven = callPackage ../build-support/build-maven.nix {}; buildMaven = callPackage ../build-support/build-maven.nix {};