lib.makePerlPath -> perlPackages.makePerlPath

2018-12-15 03:50:31 +00:00
parent 921d046537
commit bb9557eb7c
81 changed files with 313 additions and 427 deletions
@@ -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