Merge remote-tracking branch 'origin/master' into stdenv-updates

2013-01-17 14:19:14 +01:00
parent b4dd943f16 3544f32231
commit 5bb548d2e4
120 changed files with 2870 additions and 471 deletions
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -51,6 +51,9 @@ createBuildInputsPth() {
    local inputs="$2"
    if [ foo"$inputs" != foo ]; then
        for x in $inputs; do
+            if $(echo -n $x |grep -q python-recursive-pth-loader); then
+                continue
+            fi
            if test -d "$x"/lib/@libPrefix@/site-packages; then
                echo $x/lib/@libPrefix@/site-packages \
                    >> "$out"/lib/@libPrefix@/site-packages/${name}-nix-python-$category.pth