diff options
author | Nikolay Amiantov <ab@fmap.me> | 2015-10-06 17:34:20 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2015-10-07 14:58:37 +0300 |
commit | 46de04489b631224dd4d93a7e657937fb3ca0c95 (patch) | |
tree | 9bb3792724a654ebb2fc5884df544ea5df460da3 /pkgs/build-support/build-fhs-userenv/default.nix | |
parent | 583cd694d1394d341946b2de11032c5f76b5403c (diff) | |
download | nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.tar nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.tar.gz nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.tar.bz2 nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.tar.lz nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.tar.xz nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.tar.zst nixpkgs-46de04489b631224dd4d93a7e657937fb3ca0c95.zip |
build-fhs-userenv: fix extraBindMounts
Diffstat (limited to 'pkgs/build-support/build-fhs-userenv/default.nix')
-rw-r--r-- | pkgs/build-support/build-fhs-userenv/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix index d0470c72a78..424adf081ca 100644 --- a/pkgs/build-support/build-fhs-userenv/default.nix +++ b/pkgs/build-support/build-fhs-userenv/default.nix @@ -27,7 +27,7 @@ in runCommand name { passthru.env = runCommand "${name}-shell-env" { shellHook = '' - export CHROOTENV_EXTRA_BINDS="${lib.makeSearchPath extraBindMounts}:$CHROOTENV_EXTRA_BINDS" + export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS" exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)" ''; } '' @@ -40,6 +40,7 @@ in runCommand name { mkdir -p $out/bin cat <<EOF >$out/bin/${name} #! ${stdenv.shell} + export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:\$CHROOTENV_EXTRA_BINDS" exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@" EOF chmod +x $out/bin/${name} |