diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2019-01-10 03:12:32 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2019-01-10 03:12:32 +0100 |
| commit | 65a7e35cb530c9da434ebab06d59aa97b9e66f63 (patch) | |
| tree | 30227a2bc2b5a7d8c05dae1f90cfee74fe3850cb | |
| parent | e9b316453eeb9187c6c5bb538552a1927e077e64 (diff) | |
| download | guix-65a7e35cb530c9da434ebab06d59aa97b9e66f63.tar.gz guix-65a7e35cb530c9da434ebab06d59aa97b9e66f63.zip | |
gnu: docker: Substitute LookPath of literals generally.
* gnu/packages/docker.scm (docker)[arguments]<#:phases>[patch-paths]:
Substitute LookPath of literals generally.
| -rw-r--r-- | gnu/packages/docker.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index d06a894c0b..472da0ef08 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -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 _ |