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

1 files changed, 16 insertions, 6 deletions

diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index 7da1da77340d..528042e3df98 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -15,16 +15,26 @@ postInstall() {
     echo "propagating requisites $requires"
 
     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="$propagatedBuildInputs $p"
-            fi
-        done
+        if test -n "$crossConfig"; then
+            for p in $crossPkgs; do
+                if test -e $p/lib/pkgconfig/$r.pc; then
+                    echo "  found requisite $r in $p"
+                    propagatedBuildInputs="$propagatedBuildInputs $p"
+                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
 
     ensureDir "$out/nix-support"
     echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
+    echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs"
 }