diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
| commit | aa45027818af8976dc73e6a299d5d918e5c51df1 (patch) | |
| tree | 6086eb0642bc90477397169d0ee3993c1789200e /corepkgs | |
| parent | a0e3b84fac56cad6377ecd1462058a6b29bb1ea8 (diff) | |
| parent | 8032f26ca0bd2233de066ce5786ff976bbd641ae (diff) | |
* Sync with the trunk.
Diffstat (limited to 'corepkgs')
| -rwxr-xr-x | corepkgs/buildenv/builder.pl.in | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/corepkgs/buildenv/builder.pl.in b/corepkgs/buildenv/builder.pl.in index 9932ea577d93..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$/) { @@ -160,4 +168,4 @@ while (scalar(keys %postponed) > 0) { print STDERR "created $symlinks symlinks in user environment\n"; -symlink($ENV{"manifest"}, "$out/manifest") or die "cannot create manifest"; +symlink($ENV{"manifest"}, "$out/manifest.nix") or die "cannot create manifest"; |