Unverified Commit cf127c9d authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

treewide: load structured attributes in all bash builders consistently 

It's hard to put the sourcing of ./.attrs.sh into all builder
consistently - mistakes will happen. Thus, load structured attrs once in
make-derivation and then source the remaining builder on top.

This should fix quite a few builders with structured attributes in
principle. Most importantly it helps substitute / substituteAll, which
are required for bootstrap on some platforms.
parent c13f8abb

doc/stdenv/stdenv.chapter.md

+2 −10
Original line number Diff line number Diff line
@@ -75,17 +75,9 @@ stdenv.mkDerivation { 
}

```



where the builder can do anything it wants, but typically starts with

where `stdenv` sets up the environment automatically (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can use `stdenv`’s generic builder:



```bash

source $stdenv/setup

```



to let `stdenv` set up the environment (e.g. by resetting `PATH` and populating it from build inputs). If you want, you can still use `stdenv`’s generic builder:



```bash

source $stdenv/setup



buildPhase() {

  echo "... this is my custom build phase ..."

  gcc foo.c -o foo
@@ -1276,7 +1268,7 @@ addEnvHooks "$hostOffset" myBashFunction 


The *existence* of setups hooks has long been documented and packages inside Nixpkgs are free to use this mechanism. Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions. Because of the existing issues with this system, there’s little benefit from mandating it be stable for any period of time.



First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation` or when using a custom builder that has `source $stdenv/setup`. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.

First, let’s cover some setup hooks that are part of Nixpkgs default `stdenv`. This means that they are run for every package built using `stdenv.mkDerivation`, even with custom builders. Some of these are platform specific, so they may run on Linux but not Darwin or vice-versa.



### `move-docs.sh` {#move-docs.sh}

nixos/lib/make-system-tarball.sh

+0 −2
Original line number Diff line number Diff line 
source $stdenv/setup



sources_=($sources)

targets_=($targets)

nixos/modules/services/computing/slurm/slurm.nix

+0 −1
Original line number Diff line number Diff line
@@ -331,7 +331,6 @@ in 
        name = "wrappedSlurm";



        builder = pkgs.writeText "builder.sh" ''

          source $stdenv/setup

          mkdir -p $out/bin

          find  ${lib.getBin cfg.package}/bin -type f -executable | while read EXE

          do

nixos/modules/services/networking/ircd-hybrid/builder.sh

+0 −3
Original line number Diff line number Diff line 
if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi

source $stdenv/setup



doSub() {

    local src=$1

    local dst=$2

nixos/modules/services/web-servers/jboss/builder.sh

+0 −3
Original line number Diff line number Diff line 
set -e



if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi

source $stdenv/setup



mkdir -p $out/bin



cat > $out/bin/control <<EOF