Refactor opendmarc/openarc flakes

[perso/Immae/Config/Nix.git] / flakes / opendmarc / flake.nix

diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index bf7bd5bc714f1680e11763ebde4d280060d19bee..277fd259c8bbc39800ff09a9ee69cc349505b8f6 100644 (file)
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -6,18 +6,12 @@
     type = "git";
     dir = "flakes/myuids";
   };
-  inputs.libspf2 = {
-    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
-    type = "git";
-    dir = "flakes/libspf2";
-    inputs.nixpkgs.follows = "nixpkgs";
-  };
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.nixpkgs.url = "github:NixOS/nixpkgs";
 
-  outputs = { self, myuids, libspf2, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system:
+  outputs = { self, myuids, flake-utils, nixpkgs }: flake-utils.lib.eachSystem ["aarch64-linux" "i686-linux" "x86_64-linux"] (system:
     let
-      pkgs = import nixpkgs { inherit system; overlays = [ libspf2.overlay ]; };
+      pkgs = import nixpkgs { inherit system; overlays = []; };
     in rec {
       packages.opendmarc = pkgs.callPackage ./. {};
       defaultPackage = packages.opendmarc;
@@ -54,8 +48,8 @@
      nixosModule = { config, lib, pkgs, ... }:
        let
          cfg = config.services.opendmarc;
-         defaultSock = "local:/run/opendmarc/opendmarc.sock";
-         args = [ "-f" "-l" "-p" cfg.socket ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
+         defaultSock = "/run/opendmarc/opendmarc.sock";
+         args = [ "-f" "-l" "-p" "local:${cfg.socket}" ] ++ lib.optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
        in {
          options = {
            services.opendmarc = {
@@ -93,6 +87,7 @@
          };
 
          config = lib.mkIf cfg.enable {
+           nixpkgs.overlays = [ self.overlay ];
            users.users = lib.optionalAttrs (cfg.user == "opendmarc") {
              opendmarc = {
                group = cfg.group;
@@ -104,7 +99,7 @@
              opendmarc.gid = myuids.lib.gids.opendmarc;
            };
 
-           environment.systemPackages = [ self.defaultPackage."${pkgs.system}" ];
+           environment.systemPackages = [ pkgs.opendmarc ];
 
            systemd.services.opendmarc = {
              description = "OpenDMARC daemon";