From 9c442fa9014640a0dcc771635db6cc93f6c8f0f2 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sat, 28 Aug 2021 00:56:19 +0200 Subject: [PATCH] libguestfs: enable strictDeps Move bison, flex, getopt from buildInputs to nativeBuildInputs as they are build tools. Move crdkit, cpio, gperf, qemu to nativeBuildInputs. Enable strictDeps. --- .../libraries/libguestfs/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e17d0fd3363d..9715a26dcd85 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -19,15 +19,18 @@ stdenv.mkDerivation rec { sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ - ncurses cpio gperf jansson - cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex db - numactl libapparmor getopt perlPackages.ModuleBuild - libtirpc + strictDeps = true; + nativeBuildInputs = [ + autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) + ++ (with ocamlPackages; [ ocaml findlib ]); + buildInputs = [ + ncurses jansson + pcre augeas libxml2 acl libcap libcap_ng libconfig + systemd fuse yajl libvirt gmp readline file hivex db + numactl libapparmor perlPackages.ModuleBuild + libtirpc + ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) ++ lib.optional javaSupport jdk; prePatch = ''