ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-27 04:59:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: containerd: Fix more paths.

Browse source 
* gnu/packages/docker.scm (containerd)[inputs]: Add util-linux.
[arguments]<#:phases>[patch-paths]: Fix more paths.
This commit is contained in:
Danny Milosavljevic 2019-01-10 04:34:57 +01:00
parent 58adcaa19f
commit 8b487bf84f
No known key found for this signature in database
GPG key ID: E71A35542C30BAA5
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/docker.scm
View file

@ -194,6 +194,11 @@ (define-public containerd
(string-append "DefaultCommand = \"" (string-append "DefaultCommand = \""
(assoc-ref inputs "runc") (assoc-ref inputs "runc")
"/sbin/runc\"\n"))) "/sbin/runc\"\n")))
(substitute* "vendor/github.com/containerd/continuity/testutil/loopback/loopback_linux.go"
(("exec\\.Command\\(\"losetup\"") ; )
(string-append "exec.Command(\""
(assoc-ref inputs "util-linux")
"/sbin/losetup\""))) ;)
#t)) #t))
(replace 'build (replace 'build
(lambda* (#:key (make-flags '()) #:allow-other-keys) (lambda* (#:key (make-flags '()) #:allow-other-keys)
@ -206,7 +211,8 @@ (define-public containerd
(inputs (inputs
`(("btrfs-progs" ,btrfs-progs) `(("btrfs-progs" ,btrfs-progs)
("libseccomp" ,libseccomp) ("libseccomp" ,libseccomp)
("runc" ,runc))) ("runc" ,runc)
("util-linux" ,util-linux)))
(native-inputs (native-inputs
`(("go" ,go) `(("go" ,go)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))