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`.
42 lines
1.1 KiB
Bash
42 lines
1.1 KiB
Bash
if [ -e "$NIX_ATTRS_SH_FILE" ]; then . "$NIX_ATTRS_SH_FILE"; elif [ -f .attrs.sh ]; then . .attrs.sh; fi
|
|
# This is the builder for all X.org components.
|
|
source $stdenv/setup
|
|
|
|
|
|
# After installation, automatically add all "Requires" fields in the
|
|
# pkgconfig files (*.pc) to the propagated build inputs.
|
|
origPostInstall=$postInstall
|
|
postInstall() {
|
|
if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
|
|
|
|
local r p requires
|
|
set +o pipefail
|
|
requires=$(grep "Requires:" ${!outputDev}/lib/pkgconfig/*.pc | \
|
|
sed "s/Requires://" | sed "s/,/ /g")
|
|
set -o pipefail
|
|
|
|
echo "propagating requisites $requires"
|
|
|
|
for r in $requires; do
|
|
for p in "${pkgsHostHost[@]}" "${pkgsHostTarget[@]}"; do
|
|
if test -e $p/lib/pkgconfig/$r.pc; then
|
|
echo " found requisite $r in $p"
|
|
propagatedBuildInputs+=" $p"
|
|
fi
|
|
done
|
|
done
|
|
}
|
|
|
|
|
|
installFlags="appdefaultdir=$out/share/X11/app-defaults $installFlags"
|
|
|
|
|
|
if test -n "$x11BuildHook"; then
|
|
source $x11BuildHook
|
|
fi
|
|
|
|
|
|
enableParallelBuilding=1
|
|
enableParallelInstalling=1
|
|
|
|
genericBuild
|