aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-06-22 19:45:08 +0200
committerMaximilian Bosch <maximilian@mbosch.me>2021-06-22 19:45:08 +0200
commit27ce722638eeabb987bc9b4a1234c2818c5bf401 (patch)
tree1112ae949adbc528448f04acb7446f5fbfd5e2db /src
parenta92245b11026c884e76a1903abc0d47f84d79f5c (diff)
Prefix env vars for attrs.* files with NIX_
Diffstat (limited to 'src')
-rw-r--r--src/libstore/build/local-derivation-goal.cc4
-rwxr-xr-xsrc/nix-build/nix-build.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc
index 60495ae3e..de64737f4 100644
--- a/src/libstore/build/local-derivation-goal.cc
+++ b/src/libstore/build/local-derivation-goal.cc
@@ -1092,10 +1092,10 @@ void LocalDerivationGoal::writeStructuredAttrs()
writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
chownToBuilder(tmpDir + "/.attrs.sh");
- env["ATTRS_SH_FILE"] = tmpDir + "/.attrs.sh";
+ env["NIX_ATTRS_SH_FILE"] = tmpDir + "/.attrs.sh";
writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
chownToBuilder(tmpDir + "/.attrs.json");
- env["ATTRS_JSON_FILE"] = tmpDir + "/.attrs.json";
+ env["NIX_ATTRS_JSON_FILE"] = tmpDir + "/.attrs.json";
}
}
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 4e4f27458..f67776083 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -454,8 +454,8 @@ static void main_nix_build(int argc, char * * argv)
auto attrsSH = (Path) tmpDir + "/.attrs.sh";
writeFile(attrsSH, structuredAttrsRC);
- env["ATTRS_SH_FILE"] = attrsSH;
- env["ATTRS_JSON_FILE"] = attrsJSON;
+ env["NIX_ATTRS_SH_FILE"] = attrsSH;
+ env["NIX_ATTRS_JSON_FILE"] = attrsJSON;
keepTmp = true;
}
}