nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: docker: Fix more paths. 

* gnu/packages/docker.scm (docker)[inputs]: Add dbus, git.
[arguments]<#:phases>[patch-paths]: Use them.
This commit is contained in:
Danny Milosavljevic 2019-01-10 05:32:35 +01:00
parent f946a370ed
commit 6b6a25d4d2
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/docker.scm
View File

@ -31,11 +31,13 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)) #:use-module (gnu packages virtualization))
(define %docker-version "18.09.0") (define %docker-version "18.09.0")
@ -347,16 +349,16 @@ network attachments.")
(substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs") (substitute-Command "resize2fs" "e2fsprogs" "/sbin/resize2fs")
; docker-mountfrom ?? ; docker-mountfrom ??
; docker ; docker
; docker-untar ; docker-untar ??
; docker-applyLayer ; docker-applyLayer ??
; uname
; /usr/bin/uname ; /usr/bin/uname
; dbus-launch
; grep ; grep
; apparmor_parser ; apparmor_parser
(substitute-Command "ps" "procps" "/bin/ps") (substitute-Command "ps" "procps" "/bin/ps")
(substitute-Command "losetup" "util-linux" "/sbin/losetup") (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 ;; Make compilation fail when, in future versions, Docker
;; invokes other programs we don't know about and thus don't ;; invokes other programs we don't know about and thus don't
;; substitute. ;; substitute.
@ -425,7 +427,9 @@ network attachments.")
`(("btrfs-progs" ,btrfs-progs) `(("btrfs-progs" ,btrfs-progs)
("containerd" ,containerd) ; for containerd-shim ("containerd" ,containerd) ; for containerd-shim
("coreutils" ,coreutils) ("coreutils" ,coreutils)
("dbus" ,dbus)
("e2fsprogs" ,e2fsprogs) ("e2fsprogs" ,e2fsprogs)
("git" ,git)
("iproute2" ,iproute) ("iproute2" ,iproute)
("iptables" ,iptables) ("iptables" ,iptables)
("kmod" ,kmod) ("kmod" ,kmod)