mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-10 08:30:39 +02:00
Code Releases Activity

build: Fix substitutions for .service files.

Browse source 
Fixes <https://issues.guix.gnu.org/78318>.

This is a followup to 107eb8ee8f.

* nix/local.mk (etc/guix-%.service): Add ‘g’ for ‘@localstatedir@’
substitution.  Substitute ‘@storedir@’.

Reported-by: Ido Yariv <yarivido@gmail.com>
Change-Id: I9b53d3a6d713a000bc0a7a57f667badc00d2dff8
This commit is contained in:
Ludovic Courtès 2025-05-14 22:37:06 +02:00
parent 92869fcc75
commit b47eed5ea7
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
nix/local.mk
View file

@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU # 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 © 2016 Mathieu Lirzin <mthl@gnu.org>
# Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> # Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
# #
@ -171,7 +171,8 @@ etc/%.mount: etc/%.mount.in \
etc/guix-%.service: etc/guix-%.service.in \ etc/guix-%.service: etc/guix-%.service.in \
$(top_builddir)/config.status $(top_builddir)/config.status
$(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ $(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)|' \ -e 's|@''GUIX_SUBSTITUTE_URLS''@|$(GUIX_SUBSTITUTE_URLS)|' \
< "$<" > "$@.tmp"; \ < "$<" > "$@.tmp"; \
mv "$@.tmp" "$@" mv "$@.tmp" "$@"