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

2
pkgs/tools/misc/arp-scan/default.nix
View File

@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
postInstall = ''
for name in get-{oui,iab}; do
wrapProgram "$out/bin/$name" --set PERL5LIB "${stdenv.lib.makePerlPath perlModules }"
wrapProgram "$out/bin/$name" --set PERL5LIB "${perlPackages.makePerlPath perlModules }"
done;
'';

10
pkgs/tools/misc/cloc/default.nix
View File

@@ -1,6 +1,4 @@
{ stdenv, fetchFromGitHub, makeWrapper, perl
, AlgorithmDiff, ParallelForkManager, RegexpCommon
}:
{ stdenv, fetchFromGitHub, makeWrapper, perlPackages }:
stdenv.mkDerivation rec {
name = "cloc-${version}";
@@ -17,9 +15,9 @@ stdenv.mkDerivation rec {
sourceRoot=$(echo */Unix)
'';
buildInputs = [
makeWrapper perl AlgorithmDiff ParallelForkManager RegexpCommon
];
buildInputs = [ makeWrapper ] ++ (with perlPackages; [
perl AlgorithmDiff ParallelForkManager RegexpCommon
]);
makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ];

10
pkgs/tools/misc/debian-devscripts/default.nix
View File

@@ -1,5 +1,5 @@
{stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
, FileDesktopEntry, libxslt, docbook_xsl, makeWrapper
{stdenv, fetchurl, unzip, xz, dpkg
, libxslt, docbook_xsl, makeWrapper
, python3Packages
, perlPackages, curl, gnupg, diffutils
, sendmailPath ? "/run/wrappers/bin/sendmail"
@@ -16,10 +16,8 @@ in stdenv.mkDerivation rec {
sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1";
};
buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile
FileDesktopEntry libxslt python setuptools makeWrapper
perlPackages.ParseDebControl perlPackages.LWPProtocolHttps
curl gnupg diffutils ];
buildInputs = [ unzip xz dpkg libxslt python setuptools makeWrapper curl gnupg diffutils ] ++
(with perlPackages; [ perl CryptSSLeay LWP TimeDate DBFile FileDesktopEntry ParseDebControl LWPProtocolHttps ]);
preConfigure = ''
export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";

4
pkgs/tools/misc/moreutils/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper, darwin }:
{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perlPackages, makeWrapper, darwin }:
with stdenv.lib;
stdenv.mkDerivation rec {
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ]
++ optional stdenv.isDarwin darwin.cctools;
propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
propagatedBuildInputs = with perlPackages; [ perl IPCRun TimeDate TimeDuration ];
buildFlags = "CC=cc";
installFlags = "PREFIX=$(out)";

4
pkgs/tools/misc/rrdtool/default.nix
View File

@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
postInstall = ''
# for munin and rrdtool support
mkdir -p $out/lib/perl5/site_perl/
mv $out/lib/perl/5* $out/lib/perl5/site_perl/
mkdir -p $out/${perl.libPrefix}
mv $out/lib/perl/5* $out/${perl.libPrefix}
'';
meta = with stdenv.lib; {