about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorGeorges Dubus <georges.dubus@compiletoi.net>2014-08-19 11:00:46 +0200
committerGeorges Dubus <georges.dubus@compiletoi.net>2014-08-19 11:00:46 +0200
commita82e9e4b5c0faaeb4b3366e21b32f589b59c0b23 (patch)
tree43ba4f594f540deee69cb82a1b02add211cc6149 /pkgs
parentc346d2264796663fd972ee4cb6a188dd32cbf7e3 (diff)
downloadnixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.tar
nixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.tar.gz
nixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.tar.bz2
nixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.tar.lz
nixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.tar.xz
nixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.tar.zst
nixlib-a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23.zip
Added e2fsprogs to docker dependencies.
Otherwise, it complains about mkfs.ext4 not being present at service
start (and stops).
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 4a488a381abf..4571e979c6c7 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
-btrfsProgs, iptables, bash}:
+btrfsProgs, iptables, bash, e2fsprogs}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy";
   };
 
-  buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ];
+  buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs];
 
   dontStrip = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit
-    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin"
+    wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service