diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-22 23:04:18 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-04-22 23:04:18 +0000 |
commit | 7ec61219db821cf9fff8c133efe7c4d2bc69cbd1 (patch) | |
tree | b617184a8978bdd2d40352d09fa970ec7a740d3d /pkgs/tools | |
parent | 9609437573a0cb4e89e87d8274ae016743e6911e (diff) | |
download | nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.tar nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.tar.gz nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.tar.bz2 nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.tar.lz nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.tar.xz nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.tar.zst nixpkgs-7ec61219db821cf9fff8c133efe7c4d2bc69cbd1.zip |
* lib/site_perl -> lib/perl5/site_perl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15258
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/text/namazu/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/typesetting/docbook2x/default.nix | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index a57b5cc594a..9eab819612f 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -11,10 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; # First install the `File::MMagic' Perl module. + # !!! this shouldn't refer to Perl 5.10.0! preConfigure = '' ( cd File-MMagic && \ perl Makefile.PL \ - LIB="$out/lib/site_perl/5.10.0" \ + LIB="$out/lib/perl5/site_perl/5.10.0" \ INSTALLSITEMAN3DIR="$out/man" && \ make && make install ) export PERL5LIB="$out/lib/site_perl/5.10.0:$PERL5LIB" diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 30276fcb6f6..cebf71ca200 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { # XXX: We work around the fact that `wrapProgram' doesn't support # spaces below by inserting escaped backslashes. wrapProgram $out/bin/$i --prefix PERL5LIB : \ - "${perlXMLSAX}/lib/site_perl:${perlXMLParser}/lib/site_perl" \ + "${perlXMLSAX}/lib/perl5/site_perl:${perlXMLParser}/lib/perl5/site_perl" \ --prefix PERL5LIB : \ - "${perlXMLNamespaceSupport}/lib/site_perl" \ + "${perlXMLNamespaceSupport}/lib/perl5/site_perl" \ --prefix XML_CATALOG_FILES "\ " \ "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml" done |