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

Merge pull request #33642 from teozkr/libguestfs-java

Browse Source 
Added JDK dependency to libguestfs
This commit is contained in:
Eelco Dolstra 2018-01-09 15:25:55 +01:00 committed by GitHub
commit 73a01aa028
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/libraries/libguestfs/default.nix
View File

@ -2,7 +2,10 @@
, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor , gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor
, getopt, perlPackages, ocamlPackages }: , getopt, perlPackages, ocamlPackages
, javaSupport ? false, jdk ? null }:
assert javaSupport -> jdk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libguestfs-${version}"; name = "libguestfs-${version}";
@ -24,7 +27,8 @@ stdenv.mkDerivation rec {
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild
] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]); ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ])
++ stdenv.lib.optional javaSupport jdk;
prePatch = '' prePatch = ''
# build-time scripts # build-time scripts
@ -40,7 +44,8 @@ stdenv.mkDerivation rec {
# some scripts hardcore /usr/bin/env which is not available in the build env # some scripts hardcore /usr/bin/env which is not available in the build env
patchShebangs . patchShebangs .
''; '';
configureFlags = "--disable-appliance --disable-daemon"; configureFlags = [ "--disable-appliance" "--disable-daemon" ]
++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ];
patches = [ ./libguestfs-syms.patch ]; patches = [ ./libguestfs-syms.patch ];
NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
installFlags = "REALLY_INSTALL=yes"; installFlags = "REALLY_INSTALL=yes";