diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-07 10:46:47 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-07 10:46:47 +0100 |
| commit | 9eb58f5209f9cd1fd18f33b691c6a613075dffc4 (patch) | |
| tree | 5cf7c86dd196f0f3b5a83d4c4cc962d2b8333349 /tests/functional/config.nix.in | |
| parent | ca03f7cc28ba09cb4db59ca51c52d4e7783f11e0 (diff) | |
Merge pull request #9032 from Ma27/structured-attrs-env-vars
structured attrs: improve support / usage of NIX_ATTRS_{SH,JSON}_FILE
(cherry picked from commit 3c042f3b0b0a7ef9c47bf049f5410dbd4aac9e90)
Change-Id: I7e41838338ee1edf31fff6f9e354c3db2bba6c0e
Diffstat (limited to 'tests/functional/config.nix.in')
| -rw-r--r-- | tests/functional/config.nix.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/functional/config.nix.in b/tests/functional/config.nix.in index 7facbdcbc..00dc007e1 100644 --- a/tests/functional/config.nix.in +++ b/tests/functional/config.nix.in @@ -20,7 +20,10 @@ rec { derivation ({ inherit system; builder = shell; - args = ["-e" args.builder or (builtins.toFile "builder-${args.name}.sh" "if [ -e .attrs.sh ]; then source .attrs.sh; fi; eval \"$buildCommand\"")]; + args = ["-e" args.builder or (builtins.toFile "builder-${args.name}.sh" '' + if [ -e "$NIX_ATTRS_SH_FILE" ]; then source $NIX_ATTRS_SH_FILE; fi; + eval "$buildCommand" + '')]; PATH = path; } // caArgs // removeAttrs args ["builder" "meta"]) // { meta = args.meta or {}; }; |