civodul pushed a commit to branch master
in repository guix.
commit b47eed5ea78d30363af78dd593b3cc2f42f420dc
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Wed May 14 22:37:06 2025 +0200
build: Fix substitutions for .service files.
Fixes <https://issues.guix.gnu.org/78318>.
This is a followup to 107eb8ee8f5f9192c795abeb47885b49a57bacd4.
* nix/local.mk (etc/guix-%.service): Add ‘g’ for ‘@localstatedir@’
substitution. Substitute ‘@storedir@’.
Reported-by: Ido Yariv <yariv...@gmail.com>
Change-Id: I9b53d3a6d713a000bc0a7a57f667badc00d2dff8
---
nix/local.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/nix/local.mk b/nix/local.mk
index 53938ff52a..54976a5741 100644
--- a/nix/local.mk
+++ b/nix/local.mk
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012-2016, 2018-2020, 2024 Ludovic Courtès <l...@gnu.org>
+# Copyright © 2012-2016, 2018-2020, 2024-2025 Ludovic Courtès <l...@gnu.org>
# Copyright © 2016 Mathieu Lirzin <m...@gnu.org>
# Copyright © 2020 Tobias Geerinckx-Rice <m...@tobias.gr>
#
@@ -171,7 +171,8 @@ etc/%.mount: etc/%.mount.in \
etc/guix-%.service: etc/guix-%.service.in \
$(top_builddir)/config.status
$(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \
- $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' \
+ $(SED) -e 's|@''localstatedir''@|$(localstatedir)|g' \
+ -e 's|@''storedir''@|$(storedir)|g' \
-e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \
< "$<" > "$@.tmp"; \
mv "$@.tmp" "$@"
