From 59781b32d85a634de04ed015ba72db00f13b6dcc Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 13 Apr 2019 22:58:55 -0400
Subject: 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(-)

(limited to 'gnu')

diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 50ff1b69ba..669d0827c9 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -368,6 +368,9 @@ (define-public 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 @@ (define-public 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)
-- 
cgit v1.2.3

'/guix/diff/etc/guix-gc.timer?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/guix-gc.timer'>
<input type='hidden' name='id' value='467485a50a4a7261c245d36bc0778445ccc4d7f9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>root</a>/<a href='/guix/log/etc?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>etc</a>/<a href='/guix/log/etc/guix-gc.timer?id=467485a50a4a7261c245d36bc0778445ccc4d7f9'>guix-gc.timer</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/guix-gc.timer?id=467485a50a4a7261c245d36bc0778445ccc4d7f9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-09-20 14:18:21 +0000'>2021-09-20</span></td><td><a href='/guix/commit/etc/guix-gc.timer?id=5c4fd77097e2cecfd4780e099af7954f86779fe1'>etc: Add systemd files for running ‘guix gc’ periodically</a></td><td>Thiago Jung Bauermann</td></tr>