X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=flakes%2Fopendmarc%2Fflake.nix;h=277fd259c8bbc39800ff09a9ee69cc349505b8f6;hb=910c2e9eb4996bfa12cd1ef925843403f7d3e154;hp=4d6354b845dc5bfba8ad388c30192e3140358c6e;hpb=a1a2455f53bde1235b221a842d3c888c51fcecac;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index 4d6354b..277fd25 100644
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -6,45 +6,14 @@
     type = "git";
     dir = "flakes/myuids";
   };
-  inputs.libspf2 = {
-    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
-    type = "git";
-    dir = "flakes/libspf2";
-  };
   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
-      libspf2' = libspf2.defaultPackage."${system}";
       pkgs = import nixpkgs { inherit system; overlays = []; };
-      inherit (pkgs) fetchurl stdenv libbsd perl openssl libmilter file libnsl;
     in rec {
-      packages.opendmarc = stdenv.mkDerivation rec {
-        pname = "opendmarc";
-        version = "1.3.2";
-
-        src = fetchurl {
-          url = "mirror://sourceforge/opendmarc/files/${pname}-${version}.tar.gz";
-          sha256 = "1yrggj8yq0915y2i34gfz2xpl1w2lgb1vggp67rwspgzm40lng11";
-        };
-
-        configureFlags= [
-          "--with-spf"
-          "--with-spf2-include=${libspf2'}/include/spf2"
-          "--with-spf2-lib=${libspf2'}/lib/"
-          "--with-milter=${libmilter}"
-        ];
-
-        buildInputs = [ libspf2' libbsd openssl libmilter perl libnsl ];
-
-        meta = {
-          description = "Free open source software implementation of the DMARC specification";
-          homepage = "http://www.trusteddomain.org/opendmarc/";
-          platforms = stdenv.lib.platforms.unix;
-        };
-      };
-
+      packages.opendmarc = pkgs.callPackage ./. {};
       defaultPackage = packages.opendmarc;
       legacyPackages.opendmarc = packages.opendmarc;
       apps.opendmarc = flake-utils.lib.mkApp { drv = packages.opendmarc; };
@@ -69,13 +38,18 @@
             '';
           };
         };
-    }) // {
-     nixosModules = (if builtins.pathExists ../private/opendmarc.nix then import ../private/opendmarc.nix nixpkgs else {});
+    }) // rec {
+     overlays = {
+       opendmarc = final: prev: {
+         opendmarc = self.defaultPackage."${final.system}";
+       };
+     };
+     overlay = overlays.opendmarc;
      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 = {
@@ -113,6 +87,7 @@
          };
 
          config = lib.mkIf cfg.enable {
+           nixpkgs.overlays = [ self.overlay ];
            users.users = lib.optionalAttrs (cfg.user == "opendmarc") {
              opendmarc = {
                group = cfg.group;
@@ -124,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";