From 6dcc77bdb890cc6baab1ec561849d1dab3e9e65e Mon Sep 17 00:00:00 2001 From: Heitham Omar Date: Sat, 22 Jul 2017 19:27:44 +0100 Subject: [PATCH] docker: add libseccomp to build --- pkgs/applications/virtualization/docker/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index edae12fed1f4..3ba019aa8d58 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -2,7 +2,7 @@ , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, bridge-utils, devicemapper, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs -, procps +, procps, libseccomp }: with lib; @@ -63,9 +63,12 @@ rec { ]; }); + # Optimizations break compilation of libseccomp c bindings + hardeningDisable = [ "fortify" ]; + buildInputs = [ makeWrapper removeReferencesTo pkgconfig go-md2man go - sqlite devicemapper btrfs-progs systemd libtool + sqlite devicemapper btrfs-progs systemd libtool libseccomp ]; dontStrip = true; @@ -73,7 +76,8 @@ rec { DOCKER_BUILDTAGS = [] ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" - ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; + ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper" + ++ optional (libseccomp != null) "seccomp"; buildPhase = '' # build engine