3
0
Fork 0
forked from mirrors/nixpkgs

Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build

inputs did not get in)
Updating the xorg builder script to support cross building (in fact, support
for propagating the required build inputs).


svn path=/nixpkgs/branches/stdenv-updates/; revision=18569
This commit is contained in:
Lluís Batlle i Rossell 2009-11-23 19:45:18 +00:00
parent fce5b7fe78
commit d8aa5b5db1
2 changed files with 17 additions and 7 deletions

View file

@ -15,16 +15,26 @@ postInstall() {
echo "propagating requisites $requires" echo "propagating requisites $requires"
for r in $requires; do for r in $requires; do
for p in $pkgs; do if test -n "$crossConfig"; then
if test -e $p/lib/pkgconfig/$r.pc; then for p in $crossPkgs; do
echo " found requisite $r in $p" if test -e $p/lib/pkgconfig/$r.pc; then
propagatedBuildInputs="$propagatedBuildInputs $p" echo " found requisite $r in $p"
fi propagatedBuildInputs="$propagatedBuildInputs $p"
done fi
done
else
for p in $nativePkgs; do
if test -e $p/lib/pkgconfig/$r.pc; then
echo " found requisite $r in $p"
propagatedBuildNativeInputs="$propagatedBuildNativeInputs $p"
fi
done
fi
done done
ensureDir "$out/nix-support" ensureDir "$out/nix-support"
echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs" echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs"
} }

View file

@ -170,7 +170,7 @@ findInputs() {
if test -f $pkg/nix-support/$propagatedBuildInputsFile; then if test -f $pkg/nix-support/$propagatedBuildInputsFile; then
for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do
findInputs $i $var findInputs $i $var $propagatedBuildInputsFile
done done
fi fi
} }