summary refs log tree commit diff
diff options
context:
space:
mode:
authorHeitham Omar <hhomar@gmail.com>2017-07-22 19:27:44 +0100
committerRobin Gloster <mail@glob.in>2017-08-30 20:28:43 +0200
commit6dcc77bdb890cc6baab1ec561849d1dab3e9e65e (patch)
tree784f0cab0cd9fa672fc0ef4716443868a2f1244f
parent05c9a95d0e1c52dde3c2b10a31d3fe9ead5ed560 (diff)
downloadnixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.tar
nixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.tar.gz
nixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.tar.bz2
nixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.tar.lz
nixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.tar.xz
nixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.tar.zst
nixlib-6dcc77bdb890cc6baab1ec561849d1dab3e9e65e.zip
docker: add libseccomp to build
-rw-r--r--pkgs/applications/virtualization/docker/default.nix10
1 files 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