summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2019-01-10 05:32:35 +0100
committerDanny Milosavljevic <dannym@scratchpost.org>2019-01-10 05:40:53 +0100
commit6b6a25d4d2596bb75bc185c82fbaa45c8880da0c (patch)
tree1ab65137bc75f2a580a2c79001630a417fa4cfb1 /gnu/packages
parentf946a370edbf65baab41e8373e25157da5029a88 (diff)
downloadpatches-6b6a25d4d2596bb75bc185c82fbaa45c8880da0c.tar
patches-6b6a25d4d2596bb75bc185c82fbaa45c8880da0c.tar.gz
gnu: docker: Fix more paths.
* gnu/packages/docker.scm (docker)[inputs]: Add dbus, git. [arguments]<#:phases>[patch-paths]: Use them.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/docker.scm14
1 files changed, 9 insertions, 5 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index b06d48d101..ab1a575393 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -31,11 +31,13 @@
#:use-module (gnu packages base)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages golang)
#:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
+ #:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization))
(define %docker-version "18.09.0")
@@ -347,16 +349,16 @@ network attachments.")
(substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs")
; docker-mountfrom ??
; docker
-; docker-untar
-; docker-applyLayer
-; uname
+; docker-untar ??
+; docker-applyLayer ??
; /usr/bin/uname
-; dbus-launch
; grep
; apparmor_parser
(substitute-Command "ps" "procps" "/bin/ps")
(substitute-Command "losetup" "util-linux" "/sbin/losetup")
- (substitute-Command "uname" "coreutils" "/bin/uname"))
+ (substitute-Command "uname" "coreutils" "/bin/uname")
+ (substitute-Command "dbus-launch" "dbus" "/bin/dbus-launch")
+ (substitute-Command "git" "git" "/bin/git"))
;; Make compilation fail when, in future versions, Docker
;; invokes other programs we don't know about and thus don't
;; substitute.
@@ -425,7 +427,9 @@ network attachments.")
`(("btrfs-progs" ,btrfs-progs)
("containerd" ,containerd) ; for containerd-shim
("coreutils" ,coreutils)
+ ("dbus" ,dbus)
("e2fsprogs" ,e2fsprogs)
+ ("git" ,git)
("iproute2" ,iproute)
("iptables" ,iptables)
("kmod" ,kmod)