summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-04-11 22:12:00 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2019-05-05 21:21:01 -0400
commit3f280d3950f60da8f04f0dc5e767bcddc4749523 (patch)
tree57f73f62ef1c748aee18a83dbaafb150485f3b12
parent1b14e1bccdf7aecb4cd065fe5d1a20bf712b4e2f (diff)
downloadguix-3f280d3950f60da8f04f0dc5e767bcddc4749523.tar.gz
gnu: docker: Harmonize LookPath regexes.
* gnu/packages/docker.scm (docker)[phases]: In the patch-paths phase, update
the regexes used by SUBSTITUTE-LOOKPATH and SUBSTITUTE-COMMAND to match at the
start of the word, like it's done later.
-rw-r--r--gnu/packages/docker.scm9
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm
index 44f902b3ad..847871a95f 100644
--- a/gnu/packages/docker.scm
+++ b/gnu/packages/docker.scm
@@ -372,7 +372,7 @@ built-in registry server of Docker.")
                                  ((substitute-LookPath source-text package
                                                        relative-path)
                                   #`(substitute* source-files
-                                      ((#,(string-append "exec\\.LookPath\\(\""
+                                      ((#,(string-append "\\<exec\\.LookPath\\(\""
                                                          (syntax->datum
                                                           #'source-text)
                                                          "\")"))
@@ -386,11 +386,12 @@ built-in registry server of Docker.")
                                  ((substitute-LookPath source-text package
                                                        relative-path)
                                   #`(substitute* source-files
-                                      ((#,(string-append "exec\\.Command\\(\""
+                                      ((#,(string-append "\\<(re)?exec\\.Command\\(\""
                                                          (syntax->datum
                                                           #'source-text)
-                                                         "\""))
-                                       (string-append "exec.Command(\""
+                                                         "\"") _ re?)
+                                       (string-append (if re? re? "")
+                                                      "exec.Command(\""
                                                       (assoc-ref inputs package)
                                                       relative-path
                                                       "\""))))))))