diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-07-07 17:12:04 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-07-07 17:12:04 +0200 |
| commit | 4fa697e932d5634441e4e281ce6879ca3a082a30 (patch) | |
| tree | 75e39c2138d04c47105e0c378d5ae01801c62a60 /distro | |
| parent | 03f9609ad9a8118b48bef7869e48c3afaae5f6ce (diff) | |
| download | guix-4fa697e932d5634441e4e281ce6879ca3a082a30.tar guix-4fa697e932d5634441e4e281ce6879ca3a082a30.tar.gz | |
utils: Change `substitute' and `substitute*' to work with several regexps.
* guix/build/utils.scm (substitute): Change to accept a `pattern+procs'
parameter. Iterate over it.
(substitute*): Adjust accordingly.
* distro/base.scm (guile-1.8): Adjust accordingly.
Diffstat (limited to 'distro')
| -rw-r--r-- | distro/base.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/distro/base.scm b/distro/base.scm index e85b927fc3..d193b4a169 100644 --- a/distro/base.scm +++ b/distro/base.scm @@ -132,11 +132,11 @@ code.") ;; `libguile-readline.so' & co. are in the ;; loader's search path. (substitute* "libguile/dynl.c" - ("lt_dlinit.*$" match) - (format #f - " ~a~% lt_dladdsearchdir(\"~a/lib\");~%" - match - (assoc-ref outputs "out")))) + (("lt_dlinit.*$" match) + (format #f + " ~a~% lt_dladdsearchdir(\"~a/lib\");~%" + match + (assoc-ref outputs "out"))))) %standard-phases))) (inputs `(("patch/snarf" ,(search-path %load-path "distro/guile-1.8-cpp-4.5.patch")) |