diff options
| author | volth <volth@volth.com> | 2018-12-15 03:50:31 +0000 |
|---|---|---|
| committer | volth <volth@volth.com> | 2018-12-15 03:50:31 +0000 |
| commit | bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d (patch) | |
| tree | c4f1c253bf8cf5fe17612039d2a27acbdacef253 /pkgs/tools/typesetting | |
| parent | 921d046537f6d7f0fc0db07b7aa46be7e9df030b (diff) | |
| download | nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.gz nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.bz2 nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.lz nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.xz nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.tar.zst nixlib-bb9557eb7ca623ac9c12bae1fe4f95c9e290d27d.zip | |
lib.makePerlPath -> perlPackages.makePerlPath
Diffstat (limited to 'pkgs/tools/typesetting')
| -rw-r--r-- | pkgs/tools/typesetting/docbook2odf/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/docbook2x/default.nix | 14 |
2 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 029227cd1186..7200909660bd 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, makeWrapper, zip, libxslt, PerlMagick }: +{ stdenv, fetchurl, perlPackages, makeWrapper, zip, libxslt }: stdenv.mkDerivation rec { name = "docbook2odf-0.244"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "10k44g0qqa37k30pfj8vz95j6zdzz0nmnqjq1lyahfs2h4glzgwb"; }; - buildInputs = [ perl makeWrapper ]; + buildInputs = [ perlPackages.perl makeWrapper ]; installPhase = '' mkdir -p "$out/bin/" @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/bin/docbook2odf" \ --prefix PATH : "${stdenv.lib.makeBinPath [ zip libxslt ]}" \ - --prefix PERL5PATH : "${stdenv.lib.makePerlPath [PerlMagick]}" + --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.PerlMagick ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index e38e4a1f0596..5309e4555b49 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -1,5 +1,4 @@ -{ fetchurl, stdenv, texinfo, perl -, XMLSAX, XMLSAXBase, XMLParser, XMLNamespaceSupport +{ fetchurl, stdenv, texinfo, perlPackages , groff, libxml2, libxslt, gnused, libiconv, opensp , docbook_xml_dtd_43 , makeWrapper }: @@ -16,9 +15,8 @@ stdenv.mkDerivation rec { # writes its output to stdout instead of creating a file. patches = [ ./db2x_texixml-to-stdout.patch ]; - buildInputs = [ perl texinfo groff libxml2 libxslt makeWrapper - XMLSAX XMLParser XMLNamespaceSupport opensp libiconv - ]; + buildInputs = [ texinfo groff libxml2 libxslt makeWrapper opensp libiconv ] + ++ (with perlPackages; [ perl XMLSAX XMLParser XMLNamespaceSupport ]); postConfigure = '' # Broken substitution is used for `perl/config.pl', which leaves literal @@ -36,10 +34,8 @@ stdenv.mkDerivation rec { do # XXX: We work around the fact that `wrapProgram' doesn't support # spaces below by inserting escaped backslashes. - wrapProgram $out/bin/$i --prefix PERL5LIB : \ - "${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \ - --prefix PERL5LIB : \ - "${XMLNamespaceSupport}/lib/perl5/site_perl" \ + wrapProgram $out/bin/$i \ + --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [XMLSAX XMLParser XMLNamespaceSupport]} \ --prefix XML_CATALOG_FILES "\ " \ "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml" done |