From 8b28c599a3afd1a6109b0b62453a590c6bfcc6d2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 22 Apr 2009 17:32:57 +0000 Subject: [PATCH] * 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 --- pkgs/development/perl-modules/generic/builder.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index ae71f41aeb3..b22085f3cbb 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -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