about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorvolth <volth@volth.com>2018-12-15 03:50:31 +0000
committervolth <volth@volth.com>2018-12-15 03:50:31 +0000
commitbb9557eb7ca623ac9c12bae1fe4f95c9e290d27d (patch)
treec4f1c253bf8cf5fe17612039d2a27acbdacef253 /pkgs/tools/package-management
parent921d046537f6d7f0fc0db07b7aa46be7e9df030b (diff)
downloadnixlib-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/package-management')
-rw-r--r--pkgs/tools/package-management/apt/default.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index b2d5e96f391c..46da85d97488 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -1,9 +1,8 @@
-{ stdenv, lib, fetchzip, pkgconfig, cmake, perl, curl, gtest, lzma, bzip2 , lz4
+{ stdenv, lib, fetchzip, pkgconfig, cmake, perlPackages, curl, gtest, lzma, bzip2, lz4
 , db, dpkg, libxslt, docbook_xsl, docbook_xml_dtd_45
 
 # used when WITH_DOC=ON
 , w3m
-, Po4a
 , doxygen
 
 # used when WITH_NLS=ON
@@ -27,16 +26,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [
-    cmake perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin
+    cmake perlPackages.perl curl gtest lzma bzip2 lz4 db dpkg libxslt.bin
   ] ++ lib.optionals withDocs [
-    doxygen Po4a w3m docbook_xml_dtd_45
+    doxygen perlPackages.Po4a w3m docbook_xml_dtd_45
   ] ++ lib.optionals withNLS [
     gettext
   ];
 
   preConfigure = ''
-    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
-
     cmakeFlagsArray+=(
       -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include
       -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl