~ruther/guix-local

b47eed5ea78d30363af78dd593b3cc2f42f420dc — Ludovic Courtès 1 year, 2 months ago 92869fc 
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 <yarivido@gmail.com>
Change-Id: I9b53d3a6d713a000bc0a7a57f667badc00d2dff8
patch browse .tar.gz .zip 
1 files changed, 3 insertions(+), 2 deletions(-)

M nix/local.mk

M nix/local.mk => nix/local.mk +3 -2
@@ 1,5 1,5 @@
# GNU Guix --- Functional package management for GNU
# Copyright © 2012-2016, 2018-2020, 2024 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2012-2016, 2018-2020, 2024-2025 Ludovic Courtès <ludo@gnu.org>
# Copyright © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2020 Tobias Geerinckx-Rice <me@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" "$@"