Merge pull request #274075 from NixOS/backport-273834-to-release-23.11

[Backport release-23.11] nixos/restic: append PATH in wrappers instead of overwriting
NixOS · Dec 14, 2023 · c777f55 · c777f55
2 parents cbf9197 + e15f2d7
commit c777f55
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix
@@ -391,10 +391,11 @@ in
       ${lib.optionalString (backup.environmentFile != null) "source ${backup.environmentFile}"}
       # set same environment variables as the systemd service
       ${lib.pipe config.systemd.services."restic-backups-${name}".environment [
-        (lib.filterAttrs (_: v: v != null))
+        (lib.filterAttrs (n: v: v != null && n != "PATH"))
         (lib.mapAttrsToList (n: v: "${n}=${v}"))
         (lib.concatStringsSep "\n")
       ]}
+      PATH=${config.systemd.services."restic-backups-${name}".environment.PATH}:$PATH
 
       exec ${resticCmd} $@
     '') (lib.filterAttrs (_: v: v.createWrapper) config.services.restic.backups);