From 25debad443253a2c94a0f9b205480c0d22fbced0 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 00:44:03 +0000 Subject: [PATCH 1/4] tilix: fix Po4a path --- pkgs/applications/misc/tilix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 98e320b7aaf..5cd1b78e5c1 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=( - PERL5LIB="${perlPackages.Po4a}/lib/perl5" + PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl" DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' ) ''; From df8749b5a0214c8673d70725ed7bde69f4132b05 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 00:45:34 +0000 Subject: [PATCH 2/4] apt: fix Po4a path --- pkgs/tools/package-management/apt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index b2d5e96f391..7139454733a 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5"; + export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl"; cmakeFlagsArray+=( -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include From 19d06bc517fe5b697a7f386c69a2d0febaa2cff9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 01:12:14 +0000 Subject: [PATCH 3/4] apt: remove 'export PERL5LIB' --- pkgs/tools/package-management/apt/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 7139454733a..abd5e6f2f4f 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -35,8 +35,6 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5/site_perl"; - cmakeFlagsArray+=( -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl From 8fd01fd7c8bd2316f03a860fee9ef33052c2dff9 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 15 Dec 2018 01:13:00 +0000 Subject: [PATCH 4/4] tilix: remove 'export PERL5LIB' --- pkgs/applications/misc/tilix/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 5cd1b78e5c1..eb7a8e41d4b 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { preBuild = '' makeFlagsArray=( - PERL5LIB="${perlPackages.Po4a}/lib/perl5/site_perl" DCFLAGS='-O -inline -release -version=StdLoggerDisableTrace' ) '';