diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2019-04-13 22:58:55 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2019-05-05 21:21:02 -0400 |
| commit | 59781b32d85a634de04ed015ba72db00f13b6dcc (patch) | |
| tree | 0eb7adc55b43ec49aa0eda6e409da562ef53ad8d /gnu/packages | |
| parent | 80fec17f39911b05b88ed5b609ccd0c44edc5001 (diff) | |
| download | guix-59781b32d85a634de04ed015ba72db00f13b6dcc.tar.gz guix-59781b32d85a634de04ed015ba72db00f13b6dcc.zip | |
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.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/docker.scm | 6 |
1 files changed, 5 insertions, 1 deletions
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 @@ 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) |