aboutsummaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-12-13 00:06:32 +0100
committerLudovic Courtès <ludo@gnu.org>2014-12-13 00:06:32 +0100
commitc809ec94d11f1c7e23cccb988dfb1412aff72636 (patch)
treeab296451f7f626aab9822ac602de24e14ec3ffc4 /guix/build
parent5e5deea9529c0ed2e84235d778256cccc1701df9 (diff)
downloadgnu-guix-c809ec94d11f1c7e23cccb988dfb1412aff72636.tar
gnu-guix-c809ec94d11f1c7e23cccb988dfb1412aff72636.tar.gz
utils: Change 'patch-makefile-SHELL' to support ":=" assignments.
Reported by Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>. * guix/build/utils.scm (patch-makefile-SHELL): Update regexp to match ":=" assignments.
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/utils.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm
index 01ac8961d8..be91fb467b 100644
--- a/guix/build/utils.scm
+++ b/guix/build/utils.scm
@@ -638,7 +638,7 @@ When KEEP-MTIME? is true, the atime/mtime of FILE are kept unchanged."
(let ((st (stat file)))
(substitute* file
- (("^ *SHELL[[:blank:]]*=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$"
+ (("^ *SHELL[[:blank:]]*:?=[[:blank:]]*([[:graph:]]*/)([[:graph:]]+)(.*)$"
_ dir shell args)
(let* ((old (string-append dir shell))
(new (or (find-shell shell) old)))