diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 13:08:07 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-08-23 13:08:07 +0400 |
| commit | ff4c6f39dac2b3e85b622e763b39a6afe4f2f852 (patch) | |
| tree | 7e6dfb0f062c5502e0cf898ac93a5ac87fa7d407 /pkgs | |
| parent | 9b13792075b710fbe1c9299746303ecf2c221340 (diff) | |
| parent | a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23 (diff) | |
| download | nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.tar nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.tar.gz nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.tar.bz2 nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.tar.lz nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.tar.xz nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.tar.zst nixlib-ff4c6f39dac2b3e85b622e763b39a6afe4f2f852.zip | |
Merge pull request #3671 from madjar/master
Added e2fsprogs to docker dependencies.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/virtualization/docker/default.nix | 6 |
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 |