about summary refs log tree commit diff
path: root/pkgs/applications/virtualization/docker
diff options
context:
space:
mode:
authorMilan Pässler <mil@nyantec.com>2020-04-18 21:27:14 +0200
committerMilan Pässler <mil@nyantec.com>2020-04-18 21:48:55 +0200
commit08d83c16416abecef6adcc051f3536076e133f64 (patch)
tree70ead1bdb538f081c659bdd42b24973dac2b3be1 /pkgs/applications/virtualization/docker
parentb61999e4ad60c351b4da63ae3ff43aae3c0bbdfb (diff)
downloadnixlib-08d83c16416abecef6adcc051f3536076e133f64.tar
nixlib-08d83c16416abecef6adcc051f3536076e133f64.tar.gz
nixlib-08d83c16416abecef6adcc051f3536076e133f64.tar.bz2
nixlib-08d83c16416abecef6adcc051f3536076e133f64.tar.lz
nixlib-08d83c16416abecef6adcc051f3536076e133f64.tar.xz
nixlib-08d83c16416abecef6adcc051f3536076e133f64.tar.zst
nixlib-08d83c16416abecef6adcc051f3536076e133f64.zip
docker: add git to extraPath
When building a docker container from git, docker was missing the git
binary in $PATH.
Diffstat (limited to 'pkgs/applications/virtualization/docker')
-rw-r--r--pkgs/applications/virtualization/docker/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 131d6d7675ed..f1b3475d9bca 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig
 , go-md2man, go, containerd, runc, docker-proxy, tini, libtool
 , sqlite, iproute, lvm2, systemd
-, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs
+, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git
 , procps, libseccomp
 }:
 
@@ -123,7 +123,7 @@ rec {
 
     outputs = ["out" "man"];
 
-    extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]);
+    extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]);
 
     installPhase = optionalString (stdenv.isLinux) ''
       install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd