about summary refs log tree commit diff
path: root/pkgs/build-support/testers
diff options
context:
space:
mode:
authorArtturin <Artturin@artturin.com>2022-06-01 00:34:59 +0300
committerArtturin <Artturin@artturin.com>2022-12-08 06:13:19 +0200
commit238a6053c43f7ac2e3dcc3d3c7f29f1e0c0be589 (patch)
tree18784e37e82c4eb2c05c402e31cc35d071d5d807 /pkgs/build-support/testers
parent3754f950079023d005377e88eadac38e2aca65bd (diff)
stdenv: support opt-in __structuredAttrs
Co-authored-by: Robin Gloster <mail@glob.in>

stdenv: print message if structuredAttrs is enabled

stdenv: add _append

reduces the chance of a user doing it wrong

fix nix develop issue

output hooks don't work yet in nix develop though

making $outputs be the same on non-structuredAttrs and structuredAttrs
is too much trouble.

lets instead make a function that gets the output names

reading environment file '/nix/store/2x7m69a2sm2kh0r6v0q5s9z1dh41m4xf-xz-5.2.5-env-bin'
nix: src/nix/develop.cc:299: std::string Common::makeRcScript(nix::ref<nix::Store>, const BuildEnvironment&, const Path&): Assertion `outputs != buildEnvironment.vars.end()' failed.

use a function to get all output names instead of using $outputs

copy env functionality from https://github.com/NixOS/nixpkgs/pull/76732/commits
Diffstat (limited to 'pkgs/build-support/testers')
-rw-r--r--pkgs/build-support/testers/expect-failure.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh
index 0e1bbe9a678c0..052ee85271766 100644
--- a/pkgs/build-support/testers/expect-failure.sh
+++ b/pkgs/build-support/testers/expect-failure.sh
@@ -35,7 +35,7 @@ echo "testBuildFailure: Original builder produced exit code: $r"
 # -----------------------------------------
 # Write the build log to the default output
 
-outs=( $outputs )
+outs=( $(getAllOutputNames) )
 defOut=${outs[0]}
 defOutPath=${!defOut}