forked from lix-project/lix
Forward the whole Nix config to the post-build-hook
Fill `NIX_CONFIG` with the value of the current Nix configuration before calling the post-build-hook. That way the whole configuration (including the possible `experimental-features`, a possibly `--store` option or whatever) will be made available to the hook
This commit is contained in:
parent
bdc24efc87
commit
9b1f3cbc13
|
@ -757,6 +757,7 @@ void runPostBuildHook(
|
||||||
|
|
||||||
hookEnvironment.emplace("DRV_PATH", store.printStorePath(drvPath));
|
hookEnvironment.emplace("DRV_PATH", store.printStorePath(drvPath));
|
||||||
hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths))));
|
hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths))));
|
||||||
|
hookEnvironment.emplace("NIX_CONFIG", globalConfig.toKeyValue());
|
||||||
|
|
||||||
RunOptions opts(settings.postBuildHook, {});
|
RunOptions opts(settings.postBuildHook, {});
|
||||||
opts.environment = hookEnvironment;
|
opts.environment = hookEnvironment;
|
||||||
|
|
|
@ -152,6 +152,16 @@ nlohmann::json Config::toJSON()
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string Config::toKeyValue()
|
||||||
|
{
|
||||||
|
auto res = std::string();
|
||||||
|
for (auto & s : _settings)
|
||||||
|
if (!s.second.isAlias) {
|
||||||
|
res += fmt("%s = %s\n", s.first, s.second.setting->to_string());
|
||||||
|
}
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
void Config::convertToArgs(Args & args, const std::string & category)
|
void Config::convertToArgs(Args & args, const std::string & category)
|
||||||
{
|
{
|
||||||
for (auto & s : _settings)
|
for (auto & s : _settings)
|
||||||
|
@ -385,6 +395,16 @@ nlohmann::json GlobalConfig::toJSON()
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::string GlobalConfig::toKeyValue()
|
||||||
|
{
|
||||||
|
std::string res;
|
||||||
|
std::map<std::string, Config::SettingInfo> settings;
|
||||||
|
globalConfig.getSettings(settings);
|
||||||
|
for (auto & s : settings)
|
||||||
|
res += fmt("%s = %s\n", s.first, s.second.value);
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
void GlobalConfig::convertToArgs(Args & args, const std::string & category)
|
void GlobalConfig::convertToArgs(Args & args, const std::string & category)
|
||||||
{
|
{
|
||||||
for (auto & config : *configRegistrations)
|
for (auto & config : *configRegistrations)
|
||||||
|
|
|
@ -99,6 +99,12 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual nlohmann::json toJSON() = 0;
|
virtual nlohmann::json toJSON() = 0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Outputs all settings in a key-value pair format suitable to be used as
|
||||||
|
* `nix.conf`
|
||||||
|
*/
|
||||||
|
virtual std::string toKeyValue() = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts settings to `Args` to be used on the command line interface
|
* Converts settings to `Args` to be used on the command line interface
|
||||||
* - args: args to write to
|
* - args: args to write to
|
||||||
|
@ -169,6 +175,8 @@ public:
|
||||||
|
|
||||||
nlohmann::json toJSON() override;
|
nlohmann::json toJSON() override;
|
||||||
|
|
||||||
|
std::string toKeyValue() override;
|
||||||
|
|
||||||
void convertToArgs(Args & args, const std::string & category) override;
|
void convertToArgs(Args & args, const std::string & category) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -330,6 +338,8 @@ struct GlobalConfig : public AbstractConfig
|
||||||
|
|
||||||
nlohmann::json toJSON() override;
|
nlohmann::json toJSON() override;
|
||||||
|
|
||||||
|
std::string toKeyValue() override;
|
||||||
|
|
||||||
void convertToArgs(Args & args, const std::string & category) override;
|
void convertToArgs(Args & args, const std::string & category) override;
|
||||||
|
|
||||||
struct Register
|
struct Register
|
||||||
|
|
|
@ -22,10 +22,7 @@ struct CmdShowConfig : Command, MixJSON
|
||||||
// FIXME: use appropriate JSON types (bool, ints, etc).
|
// FIXME: use appropriate JSON types (bool, ints, etc).
|
||||||
logger->cout("%s", globalConfig.toJSON().dump());
|
logger->cout("%s", globalConfig.toJSON().dump());
|
||||||
} else {
|
} else {
|
||||||
std::map<std::string, Config::SettingInfo> settings;
|
logger->cout("%s", globalConfig.toKeyValue());
|
||||||
globalConfig.getSettings(settings);
|
|
||||||
for (auto & s : settings)
|
|
||||||
logger->cout("%s = %s", s.first, s.second.value);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue