nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Maxim Cournoyer 2019-04-13 22:58:55 -04:00
parent 80fec17f39
commit 59781b32d8
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/docker.scm
View File

@ -368,6 +368,9 @@ built-in registry server of Docker.")
(string-append "var userlandProxyCommandName = \"" (string-append "var userlandProxyCommandName = \""
(assoc-ref inputs "docker-proxy") (assoc-ref inputs "docker-proxy")
"/bin/proxy\"\n"))) "/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) (let ((source-files (filter (lambda (name)
(not (string-contains name "test"))) (not (string-contains name "test")))
(find-files "." "\\.go$")))) (find-files "." "\\.go$"))))
@ -528,7 +531,8 @@ built-in registry server of Docker.")
("runc" ,runc) ("runc" ,runc)
("util-linux" ,util-linux) ("util-linux" ,util-linux)
("lvm2" ,lvm2) ("lvm2" ,lvm2)
("xfsprogs" ,xfsprogs))) ("xfsprogs" ,xfsprogs)
("xz" ,xz)))
(native-inputs (native-inputs
`(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc)
("go" ,go) ("go" ,go)