max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-29 17:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

patch: nix shell: more environment variables

Browse source
This commit is contained in:
Max Headroom 2022-02-21 21:40:52 +01:00
parent 8f9a499e4d
commit 3fd4fd0d23
1 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/nix/run.cc
View file

@ -101,8 +101,37 @@ struct CmdShell : InstallablesCommand, MixEnvironment
setEnviron(); setEnviron();
std::map<std::string,std::string> pathVarMapping {
// default - always added
// { "PATH", "/bin" }
// additional
{ "CUPS_DATADIR", "/share/cups" }
, { "DICPATH", "/share/hunspell" }
, { "GIO_EXTRA_MODULES", "/lib/gio/modules" }
, { "GI_TYPELIB_PATH", "/lib/girepository-1.0" }
, { "GST_PLUGIN_PATH_1_0", "/lib/gstreamer-1.0" }
, { "GTK_PATH", "/lib/gtk-3.0" } // TODO: gtk-2.0, gtk-4.0 support
, { "INFOPATH", "/share/info" }
, { "LADSPA_PATH", "/lib/ladspa" }
, { "LD_LIBRARY_PATH", "/lib" }
, { "LIBEXEC_PATH", "/libexec" }
, { "LV2_PATH", "/lib/lv2" }
, { "MOZ_PLUGIN_PATH", "/lib/mozilla/plugins" }
, { "QTWEBKIT_PLUGIN_PATH", "/lib/mozilla/plugins" }
, { "TERMINFO_DIRS", "/share/terminfo" }
, { "XDG_CONFIG_DIRS", "/etc/xdg" }
, { "XDG_DATA_DIRS", "/share" }
};
auto unixPath = tokenizeString<Strings>(getEnv("PATH").value_or(""), ":"); auto unixPath = tokenizeString<Strings>(getEnv("PATH").value_or(""), ":");
std::map<std::string,Strings> pathVars;
for (auto const& pathV : pathVarMapping) {
pathVars[pathV.first] = tokenizeString<Strings>(getEnv(pathV.first).value_or(""), ":");
}
while (!todo.empty()) { while (!todo.empty()) {
auto path = todo.front(); auto path = todo.front();
todo.pop(); todo.pop();
@ -111,7 +140,15 @@ struct CmdShell : InstallablesCommand, MixEnvironment
if (true) if (true)
unixPath.push_front(store->printStorePath(path) + "/bin"); unixPath.push_front(store->printStorePath(path) + "/bin");
auto propPath = store->printStorePath(path) + "/nix-support/propagated-user-env-packages"; auto pathString = store->printStorePath(path);
for (auto const& pathV : pathVarMapping) {
if (accessor->stat(pathString + pathV.second).type != FSAccessor::tMissing)
pathVars[pathV.first].push_front(pathString + pathV.second);
}
auto propPath = pathString + "/nix-support/propagated-user-env-packages";
if (accessor->stat(propPath).type == FSAccessor::tRegular) { if (accessor->stat(propPath).type == FSAccessor::tRegular) {
for (auto & p : tokenizeString<Paths>(readFile(propPath))) for (auto & p : tokenizeString<Paths>(readFile(propPath)))
todo.push(store->parseStorePath(p)); todo.push(store->parseStorePath(p));
@ -119,6 +156,10 @@ struct CmdShell : InstallablesCommand, MixEnvironment
} }
setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1); setenv("PATH", concatStringsSep(":", unixPath).c_str(), 1);
for (auto const& pathV : pathVarMapping) {
setenv(pathV.first.c_str(), concatStringsSep(":", pathVars[pathV.first]).c_str(), 1);
}
Strings args; Strings args;
for (auto & arg : command) args.push_back(arg); for (auto & arg : command) args.push_back(arg);