about summary refs log tree commit diff
path: root/corepkgs
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-05-07T14·46+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-05-07T14·46+0000
commit83dfa898706e1faa491b3a50ea20baf60abda387 (patch)
treec498fcd4428bd53f41415b027bc9eb5f044c5e95 /corepkgs
parent01e58adce0767f1a484d80fcbcf67c7945cbc146 (diff)
parent4750065ada362bd46e85879975a3148e18df5b0c (diff)
* Sync with the trunk.
Diffstat (limited to 'corepkgs')
-rwxr-xr-xcorepkgs/buildenv/builder.pl.in10
1 files changed, 9 insertions, 1 deletions
diff --git a/corepkgs/buildenv/builder.pl.in b/corepkgs/buildenv/builder.pl.in
index 9eb9f7bb08c1..86abe0ca19ea 100755
--- a/corepkgs/buildenv/builder.pl.in
+++ b/corepkgs/buildenv/builder.pl.in
@@ -29,10 +29,18 @@ sub createLinks {
         $baseName =~ s/^.*\///g; # strip directory
         my $dstFile = "$dstDir/$baseName";
 
+        # The files below are special-cased so that they don't show up
+        # in user profiles, either because they are useless, or
+        # because they would cause pointless collisions (e.g., each
+        # Python package brings its own
+        # `$out/lib/pythonX.Y/site-packages/easy-install.pth'.)
         # Urgh, hacky...
-	if ($srcFile =~ /\/propagated-build-inputs$/ ||
+        if ($srcFile =~ /\/propagated-build-inputs$/ ||
             $srcFile =~ /\/nix-support$/ ||
             $srcFile =~ /\/perllocal.pod$/ ||
+            $srcFile =~ /\/easy-install.pth$/ ||
+            $srcFile =~ /\/site.py$/ ||
+            $srcFile =~ /\/site.pyc$/ ||
             $srcFile =~ /\/info\/dir$/ ||
             $srcFile =~ /\/log$/)
         {