From fadc824f205cb2bc34d06997c9efe155be1308cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 7 Jun 2023 00:06:15 +0200 Subject: [PATCH] nixos/etc: keep directories in derivation name This changes eg. etc-timesyncd.conf to etc-systemd-timesyncd.conf which better reflects the actual location of the config file. --- nixos/modules/system/etc/etc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index cfb9c39458e..ea61e7384e6 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -173,7 +173,7 @@ in config = { target = mkDefault name; source = mkIf (config.text != null) ( - let name' = "etc-" + baseNameOf name; + let name' = "etc-" + lib.replaceStrings ["/"] ["-"] name; in mkDerivedConfig options.text (pkgs.writeText name') ); };