public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.makePerlPath -> perlPackages.makePerlPath

Browse Source
This commit is contained in:
volth
2018-12-15 03:50:31 +00:00
parent 921d046537
commit bb9557eb7c
81 changed files with 313 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/text/mb2md/default.nix
+3 -3
View File
@@ -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; {
pkgs/tools/text/namazu/default.nix
+5 -6
View File
@@ -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
pkgs/tools/text/schema2ldif/default.nix
+3 -3
View File
@@ -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 perlPackages.PodUsage ]}"
'';
meta = with stdenv.lib; {