diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libguestfs/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/libguestfs/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index b875b3579037..0f56f8c97f38 100644 --- a/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db -, gmp, readline, file, numactl, xen, libapparmor, jansson +, gmp, readline, file, numactl, libapparmor, jansson , getopt, perlPackages, ocamlPackages , libtirpc , appliance ? null , javaSupport ? false, jdk ? null }: -assert appliance == null || stdenv.lib.isDerivation appliance; +assert appliance == null || lib.isDerivation appliance; assert javaSupport -> jdk != null; stdenv.mkDerivation rec { @@ -19,16 +19,16 @@ stdenv.mkDerivation rec { sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; }; - nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; + 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 xen libapparmor getopt perlPackages.ModuleBuild + numactl libapparmor getopt perlPackages.ModuleBuild libtirpc ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ stdenv.lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] - ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; + ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = stdenv.lib.optionalString (appliance != null) '' + postFixup = lib.optionalString (appliance != null) '' mkdir -p $out/{lib,lib64} ln -s ${appliance} $out/lib64/guestfs ln -s ${appliance} $out/lib/guestfs @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2 lgpl21 ]; homepage = "https://libguestfs.org/"; |