summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJaka Hudoklin <jakahudoklin@gmail.com>2015-11-16 16:17:32 +0100
committerJaka Hudoklin <jakahudoklin@gmail.com>2015-11-16 16:17:53 +0100
commit02fc10ce2533d60436399d6bbd16cfb71588bdd7 (patch)
tree49abdecbd9bf1e44541e2d70e89277ab72134dad /pkgs
parent88f5cfc1268dfd75556f8d890d841efe56243fd4 (diff)
downloadnixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.tar
nixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.tar.gz
nixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.tar.bz2
nixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.tar.lz
nixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.tar.xz
nixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.tar.zst
nixlib-02fc10ce2533d60436399d6bbd16cfb71588bdd7.zip
docker: make lxc optional
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2363ccd910b1..e8ef445c61d9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,8 +1,13 @@
-{ stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
-btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}:
+{ stdenv, fetchFromGitHub, makeWrapper
+, go, sqlite, iproute, bridge-utils, devicemapper
+, btrfsProgs, iptables, e2fsprogs, xz, utillinux
+, enableLxc ? false, lxc
+}:
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "docker-${version}";
   version = "1.8.1";
@@ -14,7 +19,10 @@ stdenv.mkDerivation rec {
     sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz";
   };
 
-  buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
+  buildInputs = [
+    makeWrapper go sqlite iproute bridge-utils devicemapper btrfsProgs
+    iptables e2fsprogs
+  ];
 
   dontStrip = true;
 
@@ -33,7 +41,8 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
-    makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin"
+    makeWrapper $out/libexec/docker/docker $out/bin/docker \
+      --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service