summaryrefslogtreecommitdiff
path: root/guix/build
diff options
context:
space:
mode:
authorBrendan Tildesley <mail@brendan.scot>2021-04-09 21:43:54 +1000
committerTobias Geerinckx-Rice <me@tobias.gr>2022-10-09 02:00:00 +0200
commit685110045c04a60bf18163aab1c230f944c871c9 (patch)
tree6daa197f7b06e0530098f301b28e6ecea863d60a /guix/build
parent77759234a3c436816297dd1e989704e37489a129 (diff)
build-system/gnu: Fix patch-dot-desktop-files regexp.
When patching .desktop files, Exec= values beginning with "/", (or spaces or newline characters) will result in BINARY matching the empty string. Changing "*", meaning 0 or more, to "+", meaning 1 or more, ensures it will match a basename of at least length 1, or nothing. * guix/build/gnu-build-system.scm (patch-dot-desktop-files): Substitute ‘+’ for ‘*’. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
Diffstat (limited to 'guix/build')
-rw-r--r--guix/build/gnu-build-system.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index d84411c090..b5b4468a45 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -727,9 +727,9 @@ which cannot be found~%"
;; UTF-8-encoded.
(with-fluids ((%default-port-encoding "UTF-8"))
(substitute* files
- (("^Exec=([^/[:blank:]\r\n]*)(.*)$" _ binary rest)
+ (("^Exec=([^/[:blank:]\r\n]+)(.*)$" _ binary rest)
(string-append "Exec=" (which binary) rest))
- (("^TryExec=([^/[:blank:]\r\n]*)(.*)$" _ binary rest)
+ (("^TryExec=([^/[:blank:]\r\n]+)(.*)$" _ binary rest)
(string-append "TryExec="
(which binary) rest)))))))))
outputs))