diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2025-05-14 22:37:06 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-05-14 22:39:03 +0200 |
| commit | b47eed5ea78d30363af78dd593b3cc2f42f420dc (patch) | |
| tree | f524ebb9ac3a8b05b0cbb006e147dd5acfe76e1d | |
| parent | 92869fcc75593a78bd78dc54fcd7464a37edf5a2 (diff) | |
| download | guix-b47eed5ea78d30363af78dd593b3cc2f42f420dc.tar.gz guix-b47eed5ea78d30363af78dd593b3cc2f42f420dc.zip | |
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
| -rw-r--r-- | nix/local.mk | 5 |
1 files 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 <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" "$@" |