guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/07: gnu: docker: Refer to xz by its absolute path.


From: guix-commits
Subject: 07/07: gnu: docker: Refer to xz by its absolute path.
Date: Sun, 5 May 2019 21:42:42 -0400 (EDT)

apteryx pushed a commit to branch master
in repository guix.

commit 59781b32d85a634de04ed015ba72db00f13b6dcc
Author: Maxim Cournoyer <address@hidden>
Date:   Sat Apr 13 22:58:55 2019 -0400

    gnu: docker: Refer to xz by its absolute path.
    
    * gnu/packages/docker.scm (docker)[inputs]: Add xz.
    [phases]{patch-paths}: Patch the reference to xz.
---
 gnu/packages/docker.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 50ff1b6..669d082 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -368,6 +368,9 @@ built-in registry server of Docker.")
                 (string-append "var userlandProxyCommandName = \""
                                (assoc-ref inputs "docker-proxy")
                                "/bin/proxy\"\n")))
+             (substitute* "pkg/archive/archive.go"
+               (("string\\{\"xz")
+                (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz")))
              (let ((source-files (filter (lambda (name)
                                            (not (string-contains name "test")))
                                          (find-files "." "\\.go$"))))
@@ -528,7 +531,8 @@ built-in registry server of Docker.")
        ("runc" ,runc)
        ("util-linux" ,util-linux)
        ("lvm2" ,lvm2)
-       ("xfsprogs" ,xfsprogs)))
+       ("xfsprogs" ,xfsprogs)
+       ("xz" ,xz)))
     (native-inputs
      `(("eudev" ,eudev)      ; TODO: Should be propagated by lvm2 (.pc -> .pc)
        ("go" ,go)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]