3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request from madjar/master

Added e2fsprogs to docker dependencies.
This commit is contained in:
Michael Raskin 2014-08-23 13:08:07 +04:00
commit ff4c6f39da

View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper, { stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper,
btrfsProgs, iptables, bash}: btrfsProgs, iptables, bash, e2fsprogs}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "docker-${version}"; name = "docker-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; 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; dontStrip = true;
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker
install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit 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 # systemd
install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service