diff options
Diffstat (limited to 'pkgs/applications/virtualization')
6 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 270a9be6eec..49920e28f76 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -72,8 +72,9 @@ rec { # Optimizations break compilation of libseccomp c bindings hardeningDisable = [ "fortify" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - makeWrapper removeReferencesTo pkgconfig go-md2man go + makeWrapper removeReferencesTo go-md2man go sqlite devicemapper btrfs-progs systemd libtool libseccomp ]; diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index a23537847a1..452f082e20e 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -4,15 +4,15 @@ let # Always get the information from # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1235.0.0"; - coreosImageSystemdVersion = "231"; + coreosImageRelease = "1478.0.0"; + coreosImageSystemdVersion = "233"; # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. stage1Flavours = [ "coreos" "fly" ]; stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.28.1"; + version = "1.29.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; @@ -20,12 +20,12 @@ in stdenv.mkDerivation rec { owner = "coreos"; repo = "rkt"; rev = "v${version}"; - sha256 = "1xn2cz30gq0500gmp5aml03hmk066fq9i04jizb5sc0j41fmsgja"; + sha256 = "0wnhii15pr4z190iladfcl4jzj9sgyl1bn5v63a3yy6nkmz9cfda"; }; stage1BaseImage = fetchurl { url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "05gk28a7zzp3j0d1y96cr1xwy9gdl4s0lpnbakzqppa4w3c4m3lq"; + sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; }; buildInputs = [ diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index f1d850cd62c..4fdb7421c3c 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { hardeningDisable = ["fortify"]; - buildInputs = [ removeReferencesTo go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ removeReferencesTo go-md2man go libseccomp libapparmor apparmor-parser ]; makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index e318a0b64d7..ddd8cf72b93 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { sha256 = "19g43gfdy5s8y4252474cp39d6ypn5dd37wp0s21fgd13vqy26px"; }; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ ]; meta = with stdenv.lib; { homepage = http://singularity.lbl.gov/; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 5608f4ed359..74da6c4ab16 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; - buildInputs = [ pkgconfig alsaLib spice_protocol glib + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ alsaLib spice_protocol glib libpciaccess libxcb libXrandr libXinerama libXfixes dbus systemd ] ; meta = { diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 434853b7cc1..9efcc45be35 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -53,8 +53,9 @@ stdenv.mkDerivation (rec { hardeningDisable = [ "stackprotector" "fortify" "pic" ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake pkgconfig which + cmake which # Xen bison bzip2 checkpolicy dev86 figlet flex gettext glib iasl libaio |