From 9b1f3cbc133eafdaadf89ee9e4f3ce6a11cbbcce Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 15 Jul 2021 18:17:18 +0200
Subject: 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
---
 src/libstore/build/derivation-goal.cc |  1 +
 src/libutil/config.cc                 | 20 ++++++++++++++++++++
 src/libutil/config.hh                 | 10 ++++++++++
 src/nix/show-config.cc                |  5 +----
 4 files changed, 32 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/libstore/build/derivation-goal.cc b/src/libstore/build/derivation-goal.cc
index 3cbcf5199..06f854629 100644
--- a/src/libstore/build/derivation-goal.cc
+++ b/src/libstore/build/derivation-goal.cc
@@ -757,6 +757,7 @@ void runPostBuildHook(
 
     hookEnvironment.emplace("DRV_PATH", store.printStorePath(drvPath));
     hookEnvironment.emplace("OUT_PATHS", chomp(concatStringsSep(" ", store.printStorePathSet(outputPaths))));
+    hookEnvironment.emplace("NIX_CONFIG", globalConfig.toKeyValue());
 
     RunOptions opts(settings.postBuildHook, {});
     opts.environment = hookEnvironment;
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index bda07cd55..2a5f913e6 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -152,6 +152,16 @@ nlohmann::json Config::toJSON()
     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)
 {
     for (auto & s : _settings)
@@ -385,6 +395,16 @@ nlohmann::json GlobalConfig::toJSON()
     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)
 {
     for (auto & config : *configRegistrations)
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index bf81b4892..df5c2226f 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -99,6 +99,12 @@ public:
      */
     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
      * - args: args to write to
@@ -169,6 +175,8 @@ public:
 
     nlohmann::json toJSON() override;
 
+    std::string toKeyValue() override;
+
     void convertToArgs(Args & args, const std::string & category) override;
 };
 
@@ -330,6 +338,8 @@ struct GlobalConfig : public AbstractConfig
 
     nlohmann::json toJSON() override;
 
+    std::string toKeyValue() override;
+
     void convertToArgs(Args & args, const std::string & category) override;
 
     struct Register
diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc
index 91721219b..29944e748 100644
--- a/src/nix/show-config.cc
+++ b/src/nix/show-config.cc
@@ -22,10 +22,7 @@ struct CmdShowConfig : Command, MixJSON
             // FIXME: use appropriate JSON types (bool, ints, etc).
             logger->cout("%s", globalConfig.toJSON().dump());
         } else {
-            std::map<std::string, Config::SettingInfo> settings;
-            globalConfig.getSettings(settings);
-            for (auto & s : settings)
-                logger->cout("%s = %s", s.first, s.second.value);
+            logger->cout("%s", globalConfig.toKeyValue());
         }
     }
 };
-- 
cgit v1.2.3