diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-11 13:41:24 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-05-11 13:41:24 +0000 |
| commit | a78d2f55fb515eae60bc533e11051b21e1e054c9 (patch) | |
| tree | d32b5f5522f945ae1972709ae5064a95bd79b9cd /pkgs/development/interpreters | |
| parent | 5dd0d8552858d40817a6486de625dc3c891542cc (diff) | |
| download | nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.tar nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.tar.gz nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.tar.bz2 nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.tar.lz nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.tar.xz nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.tar.zst nixlib-a78d2f55fb515eae60bc533e11051b21e1e054c9.zip | |
* Perl: set passthru.libPrefix to communicate the relative location of
Perl packages for $PERL5LIB. svn path=/nixpkgs/trunk/; revision=34061
Diffstat (limited to 'pkgs/development/interpreters')
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 92e3d00e02d0..6af35e275c84 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 00eaac6b1da8..ac19900bcfc3 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 c421e2768cdc..b23b95f72b5a 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 d9bf5a6d60a7..e30ce92c61e4 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 1df5cee0f86f..a46a19602e7a 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) |