Merge pull request #12026 from Ma27/2.3-backport-structured-attrs-env

[2.3] build: backport NIX_ATTRS_*_FILE
NixOS · Dec 9, 2024 · ff8cce1 · ff8cce1
2 parents 99f14d4 + 0c5333a
commit ff8cce1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
@@ -2584,6 +2584,7 @@ void DerivationGoal::writeStructuredAttrs()
 
     writeFile(tmpDir + "/.attrs.json", rewriteStrings(json.dump(), inputRewrites));
     chownToBuilder(tmpDir + "/.attrs.json");
+    env["NIX_ATTRS_JSON_FILE"] = tmpDirInSandbox + "/.attrs.json";
 
     /* As a convenience to bash scripts, write a shell file that
        maps all attributes that are representable in bash -
@@ -2653,6 +2654,7 @@ void DerivationGoal::writeStructuredAttrs()
 
     writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
     chownToBuilder(tmpDir + "/.attrs.sh");
+    env["NIX_ATTRS_SH_FILE"] = tmpDirInSandbox + "/.attrs.sh";
 }
 
 

diff --git a/tests/structured-attrs.nix b/tests/structured-attrs.nix
@@ -38,6 +38,12 @@ mkDerivation {
     [[ $json =~ '"narSize":288' ]]
     [[ $json =~ '"closureSize":288' ]]
     [[ $json =~ '"references":[]' ]]
+
+    [[ -e "$NIX_ATTRS_SH_FILE" ]]
+    [[ -e "$NIX_ATTRS_JSON_FILE" ]]
+
+    [[ "$(<"$NIX_ATTRS_SH_FILE")" = "$(<.attrs.sh)" ]]
+    [[ "$(<"$NIX_ATTRS_JSON_FILE")" = "$(<.attrs.json)" ]]
   '';
 
   buildInputs = [ "a" "b" "c" 123 "'" "\"" null ];