about summary refs log tree commit diff
path: root/pkgs/build-support/release
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/release
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/release')
-rw-r--r--pkgs/build-support/release/nix-build.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/release/nix-build.nix b/pkgs/build-support/release/nix-build.nix
index ac51b90e01639..5ed2b0752efc5 100644
--- a/pkgs/build-support/release/nix-build.nix
+++ b/pkgs/build-support/release/nix-build.nix
@@ -124,7 +124,7 @@ stdenv.mkDerivation (
       echo "$system" > $out/nix-support/system
 
       if [ -z "${toString doingAnalysis}" ]; then
-          for i in $outputs; do
+          for i in $(getAllOutputNames); do
               if [ "$i" = out ]; then j=none; else j="$i"; fi
               mkdir -p ''${!i}/nix-support
               echo "nix-build $j ''${!i}" >> ''${!i}/nix-support/hydra-build-products