From a78d2f55fb515eae60bc533e11051b21e1e054c9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 11 May 2012 13:41:24 +0000 Subject: [PATCH] * Perl: set passthru.libPrefix to communicate the relative location of Perl packages for $PERL5LIB. svn path=/nixpkgs/trunk/; revision=34061 --- pkgs/development/interpreters/perl/5.10/default.nix | 2 ++ pkgs/development/interpreters/perl/5.14/default.nix | 2 ++ pkgs/development/interpreters/perl/5.8/default.nix | 2 ++ pkgs/development/interpreters/perl/sys-perl/default.nix | 6 +++++- pkgs/development/interpreters/perl/sys-perl/setup-hook.sh | 2 +- 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/perl/5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix index 92e3d00e02d..6af35e275c8 100644 --- a/pkgs/development/interpreters/perl/5.10/default.nix +++ b/pkgs/development/interpreters/perl/5.10/default.nix @@ -57,4 +57,6 @@ stdenv.mkDerivation rec { ''; setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; } diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix index 00eaac6b1da..ac19900bcfc 100644 --- a/pkgs/development/interpreters/perl/5.14/default.nix +++ b/pkgs/development/interpreters/perl/5.14/default.nix @@ -58,4 +58,6 @@ stdenv.mkDerivation rec { ''; setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; } diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix index c421e2768cd..b23b95f72b5 100644 --- a/pkgs/development/interpreters/perl/5.8/default.nix +++ b/pkgs/development/interpreters/perl/5.8/default.nix @@ -62,4 +62,6 @@ genericBuild ]; setupHook = ./setup-hook.sh; + + passthru.libPrefix = "lib/perl5/site_perl"; } diff --git a/pkgs/development/interpreters/perl/sys-perl/default.nix b/pkgs/development/interpreters/perl/sys-perl/default.nix index d9bf5a6d60a..e30ce92c61e 100644 --- a/pkgs/development/interpreters/perl/sys-perl/default.nix +++ b/pkgs/development/interpreters/perl/sys-perl/default.nix @@ -1,6 +1,6 @@ { stdenv }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "perl"; unpackPhase = "true"; @@ -12,4 +12,8 @@ stdenv.mkDerivation { ''; setupHook = ./setup-hook.sh; + + libPrefix = "lib/perl5/site_perl/5.10/i686-cygwin"; + + passthru.libPrefix = libPrefix; } diff --git a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh index 1df5cee0f86..a46a19602e7 100644 --- a/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh +++ b/pkgs/development/interpreters/perl/sys-perl/setup-hook.sh @@ -1,5 +1,5 @@ addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl/5.10/i686-cygwin + addToSearchPath PERL5LIB $1/@libPrefix@ } envHooks=(${envHooks[@]} addPerlLibPath)