lbodor/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix dev-shell: Refactor script for getting the environment

Browse source
This commit is contained in:
Eelco Dolstra 2020-04-30 13:05:29 +02:00
parent df8e9d691c
commit 2fcfc6c2c6
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nix/get-env.sh Normal file
View file

@ -0,0 +1,8 @@
set -e
export IN_NIX_SHELL=impure
export dontAddDisableDepTrack=1
if [[ -n $stdenv ]]; then
source $stdenv/setup
fi
export > $out
set >> $out

2
src/nix/local.mk
View file

@ -27,3 +27,5 @@ $(foreach name, \
$(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote)) $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote))
src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh
src/nix/shell.cc: src/nix/get-env.sh.gen.hh

18
src/nix/shell.cc
View file

@ -83,6 +83,10 @@ BuildEnvironment readEnvironment(const Path & path)
return res; return res;
} }
const static std::string getEnvSh =
#include "get-env.sh.gen.hh"
;
/* Given an existing derivation, return the shell environment as /* Given an existing derivation, return the shell environment as
initialised by stdenv's setup script. We do this by building a initialised by stdenv's setup script. We do this by building a
modified derivation with the same dependencies and nearly the same modified derivation with the same dependencies and nearly the same
@ -94,16 +98,9 @@ StorePath getDerivationEnvironment(ref<Store> store, Derivation drv)
if (builder != "bash") if (builder != "bash")
throw Error("'nix dev-shell' only works on derivations that use 'bash' as their builder"); throw Error("'nix dev-shell' only works on derivations that use 'bash' as their builder");
drv.args = { auto getEnvShPath = store->addTextToStore("get-env.sh", getEnvSh, {});
"-c",
"set -e; " drv.args = {store->printStorePath(getEnvShPath)};
"export IN_NIX_SHELL=impure; "
"export dontAddDisableDepTrack=1; "
"if [[ -n $stdenv ]]; then "
" source $stdenv/setup; "
"fi; "
"export > $out; "
"set >> $out "};
/* Remove derivation checks. */ /* Remove derivation checks. */
drv.env.erase("allowedReferences"); drv.env.erase("allowedReferences");
@ -120,6 +117,7 @@ StorePath getDerivationEnvironment(ref<Store> store, Derivation drv)
drv.env.erase(output.first); drv.env.erase(output.first);
drv.env["out"] = ""; drv.env["out"] = "";
drv.env["outputs"] = "out"; drv.env["outputs"] = "out";
drv.inputSrcs.insert(std::move(getEnvShPath));
Hash h = hashDerivationModulo(*store, drv, true); Hash h = hashDerivationModulo(*store, drv, true);
auto shellOutPath = store->makeOutputPath("out", h, drvName); auto shellOutPath = store->makeOutputPath("out", h, drvName);
drv.outputs.insert_or_assign("out", DerivationOutput(shellOutPath.clone(), "", "")); drv.outputs.insert_or_assign("out", DerivationOutput(shellOutPath.clone(), "", ""));