summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-23 19:45:18 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-23 19:45:18 +0000
commitd8aa5b5db19275b428d0b2a84cf26ecf836f3a55 (patch)
treeeb82100d2e53687727cb1b0a06bb2bece6d4c0f5 /pkgs/stdenv
parentfce5b7fe78346ef088c148e5b03fbff116277b6f (diff)
downloadnixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.tar
nixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.tar.gz
nixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.tar.bz2
nixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.tar.lz
nixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.tar.xz
nixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.tar.zst
nixlib-d8aa5b5db19275b428d0b2a84cf26ecf836f3a55.zip
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
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 631182f6b7c3..f8c497f37c29 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -170,7 +170,7 @@ findInputs() {
 
     if test -f $pkg/nix-support/$propagatedBuildInputsFile; then
         for i in $(cat $pkg/nix-support/$propagatedBuildInputsFile); do
-            findInputs $i $var
+            findInputs $i $var $propagatedBuildInputsFile
         done
     fi
 }