da19c34d0f
This continues #23374, which always kept around both attributes, by always including both propagated files: `propgated-native-build-inputs` and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still defined as before, however, so this change should only barely observable. This is an incremental step to fully keeping the dependencies separate in all cases.
45 lines
1.1 KiB
Bash
45 lines
1.1 KiB
Bash
# 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"
|
|
|
|
if test -n "$crossConfig"; then
|
|
local pkgs=("${crossPkgs[@]}")
|
|
else
|
|
local pkgs=("${nativePkgs[@]}")
|
|
fi
|
|
for r in $requires; do
|
|
for p in "${pkgs[@]}"; 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
|
|
|
|
genericBuild
|