diff options
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/mb2md/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/namazu/default.nix | 11 | ||||
-rw-r--r-- | pkgs/tools/text/popfile/default.nix | 1 | ||||
-rw-r--r-- | pkgs/tools/text/schema2ldif/default.nix | 6 |
4 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/tools/text/mb2md/default.nix b/pkgs/tools/text/mb2md/default.nix index a920cbf39482..adaff3e2f436 100644 --- a/pkgs/tools/text/mb2md/default.nix +++ b/pkgs/tools/text/mb2md/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, perl, makeWrapper, perlPackages }: +{ stdenv, lib, fetchurl, makeWrapper, perlPackages }: let perlDeps = with perlPackages; [ TimeDate ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ perl ]; + buildInputs = [ perlPackages.perl ]; unpackPhase = '' sourceRoot=. @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/mb2md \ - --set PERL5LIB "${lib.makePerlPath perlDeps}" + --set PERL5LIB "${perlPackages.makePerlPath perlDeps}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 67a26cb41aa0..59cfc86efbf3 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -11,14 +11,13 @@ 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/perl5/site_perl/5.10.0" \ - INSTALLSITEMAN3DIR="$out/man" && \ + ( cd File-MMagic && \ + perl Makefile.PL \ + LIB="$out/${perl.libPrefix}/${perl.version}" \ + INSTALLSITEMAN3DIR="$out/man" && \ make && make install ) - export PERL5LIB="$out/lib/perl5/site_perl/5.10.0:$PERL5LIB" + export PERL5LIB="$out/${perl.libPrefix}/${perl.version}:$PERL5LIB" ''; # FIXME: The `tests/namazu-6' test fails on GNU/Linux, presumably because diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index dbc16cf7a453..5e76e3541733 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { perl DBI DBDSQLite - DigestMD5 HTMLTagset TimeDate # == DateParse HTMLTemplate diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix index 699d2d28b82b..2df6cbb27a2d 100644 --- a/pkgs/tools/text/schema2ldif/default.nix +++ b/pkgs/tools/text/schema2ldif/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec { +{ stdenv, fetchurl, makeWrapper, perlPackages }: stdenv.mkDerivation rec { name = "schema2ldif-${version}"; version = "1.3"; @@ -7,7 +7,7 @@ sha256 = "00cd9xx9g0mnnfn5lvay3vg166z84jla0ya1x34ljdc8bflxsr9a"; }; - buildInputs = [ perl ]; + buildInputs = [ perlPackages.perl ]; nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -18,7 +18,7 @@ gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz wrapProgram $out/bin/schema2ldif \ - --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}" + --prefix PERL5PATH : "${perlPackages.makePerlPath [ perlPackages.GetoptLong ]}" ''; meta = with stdenv.lib; { |