8bc5104a6e
When specifying the `builder` attribute in `stdenv.mkDerivation`, this will be effectively transformed into builtins.derivation { builder = stdenv.shell; args = [ "-e" builder ]; } This also means that `default-builder.sh` is never sourced and as a result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct location[1]. Also, we need to source `.attrs.sh` to source `$stdenv`. So, the following is done now: * If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it. Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage (see previous commit for more context), so prefer the environment variable if possible. * Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this can happen. * If neither applies, it can be assumed that `__structuredAttrs` is turned off and thus nothing needs to be done. [1] It's possible that it doesn't exist at all - in case of Nix 2.3 or it can point to a wrong location on older Nix versions with a bug in `__structuredAttrs`.
15 lines
531 B
Bash
15 lines
531 B
Bash
if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
|
|
source $stdenv/setup
|
|
|
|
echo "exporting $url (r$rev) into $out"
|
|
|
|
if test "$sshSupport"; then
|
|
export SVN_SSH="$openssh/bin/ssh"
|
|
fi
|
|
|
|
# Pipe the "p" character into Subversion to force it to accept the
|
|
# server's certificate. This is perfectly safe: we don't care
|
|
# whether the server is being spoofed --- only the cryptographic
|
|
# hash of the output matters.
|
|
expect -f $sshSubversion "$username" "$password" "$rev" "$url" $out
|