diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2021-05-13 16:11:56 +0200 |
---|---|---|
committer | Maximilian Bosch <maximilian@mbosch.me> | 2021-06-22 19:15:57 +0200 |
commit | f1e281c4fe1263a0c848bc8aaf57a0e61a99fa93 (patch) | |
tree | 0441e2eb826aad0530f7c6522a355ad332b9581f /src/libstore/parsed-derivations.cc | |
parent | 447928bdb55d160617387e7ac5954f9a8f36004b (diff) |
Split shell & json creation for build environments with structured attrs
Diffstat (limited to 'src/libstore/parsed-derivations.cc')
-rw-r--r-- | src/libstore/parsed-derivations.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libstore/parsed-derivations.cc b/src/libstore/parsed-derivations.cc index 029da8bd3..5675600c4 100644 --- a/src/libstore/parsed-derivations.cc +++ b/src/libstore/parsed-derivations.cc @@ -124,8 +124,7 @@ bool ParsedDerivation::substitutesAllowed() const } static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*"); -std::optional<StructuredAttrsWithShellRC> ParsedDerivation::generateStructuredAttrs( - std::optional<StringMap> inputRewrites, Store & store, const StorePathSet & inputPaths) +std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(std::optional<StringMap> inputRewrites, Store & store, const StorePathSet & inputPaths) { auto structuredAttrs = getStructuredAttrs(); if (!structuredAttrs) return std::nullopt; @@ -163,6 +162,11 @@ std::optional<StructuredAttrsWithShellRC> ParsedDerivation::generateStructuredAt } } + return json; +} + +std::string ParsedDerivation::writeStructuredAttrsShell(nlohmann::json & json) +{ /* As a convenience to bash scripts, write a shell file that maps all attributes that are representable in bash - namely, strings, integers, nulls, Booleans, and arrays and @@ -229,6 +233,6 @@ std::optional<StructuredAttrsWithShellRC> ParsedDerivation::generateStructuredAt } } - return std::make_pair(jsonSh, json); + return jsonSh; } } |