From 4bab25a28d32f0551ac20b8b9b33e79af5decf0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 3 May 2010 13:13:38 +0000 Subject: [PATCH] buildenv: Special-case Python's `easy-install.pth' files. * corepkgs/buildenv/builder.pl.in (createLinks): Skip `easy-install.pth' files. Comment the hack. --- corepkgs/buildenv/builder.pl.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/corepkgs/buildenv/builder.pl.in b/corepkgs/buildenv/builder.pl.in index 9932ea577..4101f66a4 100755 --- a/corepkgs/buildenv/builder.pl.in +++ b/corepkgs/buildenv/builder.pl.in @@ -29,10 +29,16 @@ 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 =~ /\/info\/dir$/ || $srcFile =~ /\/log$/) {