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/development/libraries/libguestfs/default.nix
+8 -7
View File
@@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, libintl_perl, GetoptLong, SysVirt, numactl, xen, libapparmor
, gmp, readline, file, numactl, xen, libapparmor
, getopt, perlPackages, ocamlPackages
, appliance ? null
, javaSupport ? false, jdk ? null }:
@@ -20,11 +20,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
makeWrapper autoreconfHook ncurses cpio gperf perl
makeWrapper autoreconfHook ncurses cpio gperf
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex libintl_perl GetoptLong
SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ])
systemd fuse yajl libvirt gmp readline file hivex
numactl xen libapparmor getopt perlPackages.ModuleBuild
] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ])
++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ])
++ stdenv.lib.optional javaSupport jdk;
prePatch = ''
@@ -52,7 +53,7 @@ stdenv.mkDerivation rec {
for bin in $out/bin/*; do
wrapProgram "$bin" \
--prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \
--prefix PERL5LIB : "$out/lib/perl5/site_perl"
--prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}"
done
'';