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

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

9
gnu/packages/docker.scm
View File

@ -372,7 +372,7 @@ built-in registry server of Docker.")
((substitute-LookPath source-text package ((substitute-LookPath source-text package
relative-path) relative-path)
#`(substitute* source-files #`(substitute* source-files
((#,(string-append "exec\\.LookPath\\(\"" ((#,(string-append "\\<exec\\.LookPath\\(\""
(syntax->datum (syntax->datum
#'source-text) #'source-text)
"\")")) "\")"))
@ -386,11 +386,12 @@ built-in registry server of Docker.")
((substitute-LookPath source-text package ((substitute-LookPath source-text package
relative-path) relative-path)
#`(substitute* source-files #`(substitute* source-files
((#,(string-append "exec\\.Command\\(\"" ((#,(string-append "\\<(re)?exec\\.Command\\(\""
(syntax->datum (syntax->datum
#'source-text) #'source-text)
"\"")) "\"") _ re?)
(string-append "exec.Command(\"" (string-append (if re? re? "")
"exec.Command(\""
(assoc-ref inputs package) (assoc-ref inputs package)
relative-path relative-path
"\"")))))))) "\""))))))))