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

gnu: docker: Substitute LookPath of literals generally. 

* gnu/packages/docker.scm (docker)[arguments]<#:phases>[patch-paths]:
Substitute LookPath of literals generally.
This commit is contained in:
Danny Milosavljevic 2019-01-10 03:12:32 +01:00
parent e9b316453e
commit 65a7e35cb5
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnu/packages/docker.scm
View File

@ -311,7 +311,14 @@ network attachments.")
(substitute-LookPath "blkid" "util-linux" "/sbin/blkid")
(substitute-LookPath "unpigz" "pigz" "/bin/unpigz")
(substitute-LookPath "iptables" "iptables" "/sbin/iptables")
(substitute-LookPath "ip" "iproute2" "/sbin/ip")))
(substitute-LookPath "ip" "iproute2" "/sbin/ip"))
;; Make compilation fail when, in future versions, Docker
;; invokes other programs we don't know about and thus don't
;; substitute.
(substitute* source-files
(("LookPath\\(\"zfs\"\\)") "LooxPath(\"zfs\")")
(("LookPath\\(\"") "Guix_doesnt_want_LookPath\\(\"")
(("LooxPath") "LookPath")))
#t))
(add-after 'patch-paths 'delete-failing-tests
(lambda _