* Removed the hack to fix the installation path of some Perl

packages.  Turns out that those packages set INSTALLDIRS=perl, so we
  override it to INSTALLDIRS=site.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15251
This commit is contained in:
Eelco Dolstra 2009-04-22 17:32:57 +00:00
parent 26c3fe186f
commit 8b28c599a3

View file

@ -25,10 +25,9 @@ preConfigure() {
fi
done
perl Makefile.PL PREFIX=$out $makeMakerFlags
perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags
}
postFixup=postFixup
postFixup() {
# If a user installs a Perl package, she probably also wants its
# dependencies in the user environment (since Perl modules don't
@ -37,15 +36,6 @@ postFixup() {
if test -e $out/nix-support/propagated-build-inputs; then
ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
fi
# Some (broken?) packages install in $out/lib/${perlVersion}
# instead of $out/lib/site_perl/${perlVersion}. Try to fix that
# automatically.
if ! test -e $out/lib/site_perl; then
echo "fixing wrong Perl installation path..."
ensureDir $out/lib/site_perl
for i in $out/lib/5.*; do mv $i $out/lib/site_perl; done
fi
}
if test -n "$perlPreHook"; then