Skip to content

Set NIX_SHELL_PACKAGES in nix shell #15297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lisanna-dettwyler wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −2
Open

Set NIX_SHELL_PACKAGES in nix shell #15297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/nix/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <queue>

#include <boost/unordered/unordered_flat_set.hpp>
#include <boost/algorithm/string/join.hpp>

#include "nix/cmd/command.hh"
#include "nix/expr/eval.hh"
Expand Down Expand Up @@ -78,9 +79,8 @@ struct CmdShell : InstallablesCommand, MixEnvironment
for (auto & path : outPaths)
todo.push(path);

setEnviron();

std::vector<std::string> pathAdditions;
std::vector<std::string> packageNames;

while (!todo.empty()) {
auto path = todo.front();
Expand All @@ -100,8 +100,17 @@ struct CmdShell : InstallablesCommand, MixEnvironment
for (auto & p : tokenizeString<Paths>(state->storeFS->readFile(propPath)))
todo.push(store->parseStorePath(p));
}

packageNames.push_back(std::string(path.name()));
}

auto existingPackagesVar = getEnvOs(OS_STR("NIX_SHELL_PACKAGES")).value_or(OS_STR(""));
if (!existingPackagesVar.empty())
packageNames.push_back(existingPackagesVar);
setVars["NIX_SHELL_PACKAGES"] = boost::algorithm::join(packageNames, " ");

setEnviron();

// TODO: split losslessly; empty means .
auto unixPath = ExecutablePath::load();
unixPath.directories.insert(unixPath.directories.begin(), pathAdditions.begin(), pathAdditions.end());
Expand Down
1 change: 1 addition & 0 deletions tests/functional/shell.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ sed -i \
-e '/^TMPDIR=\/var\/folders\/.*/d' \
-e '/^__CF_USER_TEXT_ENCODING=.*$/d' \
-e '/^__LLVM_PROFILE_RT_INIT_ONCE=.*$/d' \
-e '/^NIX_SHELL_PACKAGES=.*$/d' \
"$TEST_ROOT/expected-env" "$TEST_ROOT/actual-env"
sort "$TEST_ROOT/expected-env" > "$TEST_ROOT/expected-env.sorted"
sort "$TEST_ROOT/actual-env" > "$TEST_ROOT/actual-env.sorted"
Expand Down
Loading