[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: containerd: Fix more paths.
From: |
guix-commits |
Subject: |
02/03: gnu: containerd: Fix more paths. |
Date: |
Wed, 9 Jan 2019 22:53:16 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit 8b487bf84f3e93883821910148bec6d3dfa80477
Author: Danny Milosavljevic <address@hidden>
Date: Thu Jan 10 04:34:57 2019 +0100
gnu: containerd: Fix more paths.
* gnu/packages/docker.scm (containerd)[inputs]: Add util-linux.
[arguments]<#:phases>[patch-paths]: Fix more paths.
---
gnu/packages/docker.scm | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 9ff1361..5aadfe4 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -194,6 +194,11 @@ Python without keeping their credentials in a Docker
configuration file.")
(string-append "DefaultCommand = \""
(assoc-ref inputs "runc")
"/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))
(replace 'build
(lambda* (#:key (make-flags '()) #:allow-other-keys)
@@ -206,7 +211,8 @@ Python without keeping their credentials in a Docker
configuration file.")
(inputs
`(("btrfs-progs" ,btrfs-progs)
("libseccomp" ,libseccomp)
- ("runc" ,runc)))
+ ("runc" ,runc)
+ ("util-linux" ,util-linux)))
(native-inputs
`(("go" ,go)
("pkg-config" ,pkg-config)))