mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix run: Respect propagated-user-env-packages

Browse source 
Also, add $path/bin to $PATH even if it doesn't exist. This makes
'man' work properly (since it looks for ../share/man relative to $PATH
entries).
This commit is contained in:
Eelco Dolstra 2018-08-09 13:01:03 +02:00
parent a0b971dd9c
commit c87f4b9324
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/nix/run.cc
View file

@ -12,6 +12,8 @@
#include <sys/mount.h> #include <sys/mount.h>
#endif #endif
#include <queue>
using namespace nix; using namespace nix;
std::string chrootHelperName = "__run_in_chroot"; std::string chrootHelperName = "__run_in_chroot";
@ -121,10 +123,27 @@ struct CmdRun : InstallablesCommand
unsetenv(var.c_str()); unsetenv(var.c_str());
} }
std::unordered_set<Path> done;
std::queue<Path> todo;
for (auto & path : outPaths) todo.push(path);
auto unixPath = tokenizeString<Strings>(getEnv("PATH"), ":"); auto unixPath = tokenizeString<Strings>(getEnv("PATH"), ":");
for (auto & path : outPaths)
if (accessor->stat(path + "/bin").type != FSAccessor::tMissing) while (!todo.empty()) {
Path path = todo.front();
todo.pop();
if (!done.insert(path).second) continue;
if (true)
unixPath.push_front(path + "/bin"); unixPath.push_front(path + "/bin");
auto propPath = path + "/nix-support/propagated-user-env-packages";
if (accessor->stat(propPath).type == FSAccessor::tRegular) {
for (auto & p : tokenizeString<Paths>(readFile(propPath)))
todo.push(p);
}
}
setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1); setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1);
std::string cmd = *command.begin(); std::string cmd = *command.begin();