sourcehut: fix preStart merging

diff --git a/nixos/modules/services/misc/sourcehut/service.nix b/nixos/modules/services/misc/sourcehut/service.nix
index 44195b12329fd0ee40fd830f406360eb79dcde68..8d80361b2a5ac814c8cf1c05cbb8f1e721186e14 100644 (file)
--- a/nixos/modules/services/misc/sourcehut/service.nix
+++ b/nixos/modules/services/misc/sourcehut/service.nix
@@ -11,7 +11,7 @@ with serviceCfg; with lib; mkMerge [
   environment.HOME = statePath;
   after = optional (serviceDrv.pname != "metasrht" && cfg.meta.enable) "metasrht.service";
   requires = optional (serviceDrv.pname != "metasrht" && cfg.meta.enable) "metasrht.service";
-  path = [ config.services.postgresql.package ] ++ (attrs.path or [ ]);
+  path = [ config.services.postgresql.package ];
   restartTriggers = [ config.environment.etc."sr.ht/config.ini".source ];
   serviceConfig = {
     Type = "simple";
@@ -22,7 +22,7 @@ with serviceCfg; with lib; mkMerge [
     StateDirectory = [ "sourcehut/${serviceDrv.pname}" ];
   };
 
-  preStart = ''
+  preStart = mkBefore ''
     if ! test -e ${statePath}/db; then
       # Setup the initial database
       ${cfg.python}/bin/python <<EOF
@@ -57,9 +57,7 @@ with serviceCfg; with lib; mkMerge [
         printf "%s" "${serviceDrv.version}" > ${statePath}/db
       fi
     ''}
-
-    ${attrs.preStart or ""}
   '';
 }
-(builtins.removeAttrs attrs [ "path" "preStart" ])
+attrs
 ]