1 files changed, 10 insertions, 29 deletions

diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index e80376f..bf7bd5b 100644
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -10,41 +10,16 @@
     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:
     let
-      libspf2' = libspf2.defaultPackage."${system}";
-      pkgs = import nixpkgs { inherit system; overlays = []; };
-      inherit (pkgs) fetchurl stdenv libbsd perl openssl libmilter file libnsl;
+      pkgs = import nixpkgs { inherit system; overlays = [ libspf2.overlay ]; };
     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,7 +44,13 @@
             '';
           };
         };
-    }) // {
+    }) // rec {
+     overlays = {
+       opendmarc = final: prev: {
+         opendmarc = self.defaultPackage."${final.system}";
+       };
+     };
+     overlay = overlays.opendmarc;
      nixosModule = { config, lib, pkgs, ... }:
        let
          cfg = config.services.opendmarc;