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

5
pkgs/development/tools/misc/creduce/default.nix
View File

@@ -2,7 +2,7 @@
, llvm, clang-unwrapped
, flex
, zlib
, perl, ExporterLite, FileWhich, GetoptTabular, RegexpCommon, TermReadKey
, perlPackages
, utillinux
}:
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
# Actual deps:
llvm clang-unwrapped
flex zlib
perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey
];
] ++ (with perlPackages; [ perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey ]);
# On Linux, c-reduce's preferred way to reason about
# the cpu architecture/topology is to use 'lscpu',

4
pkgs/development/tools/misc/csmith/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, m4, makeWrapper, libbsd, perl, SysCPU }:
{ stdenv, fetchurl, m4, makeWrapper, libbsd, perlPackages }:
stdenv.mkDerivation rec {
name = "csmith-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ m4 makeWrapper ];
buildInputs = [ perl SysCPU libbsd ];
buildInputs = [ libbsd ] ++ (with perlPackages; [ perl SysCPU ]);
postInstall = ''
substituteInPlace $out/bin/compiler_test.pl \

9
pkgs/development/tools/misc/help2man/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, gettext, LocaleGettext }:
{ stdenv, fetchurl, perlPackages, gettext }:
stdenv.mkDerivation rec {
name = "help2man-1.47.8";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "1p5830h88cx0zn0snwaj0vpph81xicpsirfwlxmcgjrlmn0nm3sj";
};
nativeBuildInputs = [ gettext LocaleGettext ];
buildInputs = [ perl LocaleGettext ];
nativeBuildInputs = [ gettext perlPackages.LocaleGettext ];
buildInputs = [ perlPackages.perl perlPackages.LocaleGettext ];
doCheck = false; # target `check' is missing
@@ -18,11 +18,10 @@ stdenv.mkDerivation rec {
# We don't use makeWrapper here because it uses substitutions our
# bootstrap shell can't handle.
postInstall = ''
gettext_perl="$(echo ${LocaleGettext}/lib/perl*/site_perl)"
mv $out/bin/help2man $out/bin/.help2man-wrapped
cat > $out/bin/help2man <<EOF
#! $SHELL -e
export PERL5LIB=\''${PERL5LIB:+:}$gettext_perl
export PERL5LIB=\''${PERL5LIB:+:}${perlPackages.LocaleGettext}/${perlPackages.perl.libPrefix}
${stdenv.lib.optionalString stdenv.hostPlatform.isCygwin
''export PATH=\''${PATH:+:}${gettext}/bin''}
exec -a \$0 $out/bin/.help2man-wrapped "\$@"

6
pkgs/development/tools/misc/icon-naming-utils/default.nix
View File

@@ -1,4 +1,4 @@
{stdenv, fetchurl, perl, XMLSimple, librsvg}:
{stdenv, fetchurl, perlPackages, librsvg}:
stdenv.mkDerivation rec {
name = "icon-naming-utils-0.8.90";
@@ -8,13 +8,13 @@ stdenv.mkDerivation rec {
sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";
};
buildInputs = [perl XMLSimple librsvg];
buildInputs = [ librsvg ] ++ (with perlPackages; [ perl XMLSimple ]);
postInstall =
''
# Add XML::Simple to the runtime search path.
substituteInPlace $out/libexec/icon-name-mapping \
--replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl'
--replace '/bin/perl' '/bin/perl -I${perlPackages.XMLSimple}/${perlPackages.perl.libPrefix}'
'';
meta = with stdenv.lib; {