X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=flakes%2Fopendmarc%2Fflake.nix;h=70b8cd7171a11069a734ecb1875e916d8a8e60fd;hb=1a64deeb894dc95e2645a75771732c6cc53a79ad;hp=469cf74f24b3e09e3e187c465a73604718512812;hpb=f4721555d1f15c180504b1363b422f37f2d5b3f0;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/flakes/opendmarc/flake.nix b/flakes/opendmarc/flake.nix
index 469cf74..70b8cd7 100644
--- a/flakes/opendmarc/flake.nix
+++ b/flakes/opendmarc/flake.nix
@@ -2,22 +2,14 @@
   description = "Open source ARC implementation";
 
   inputs.myuids = {
-    url = "https://git.immae.eu/perso/Immae/Config/Nix.git";
-    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";
+    url = "path:../myuids";
   };
   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,10 +46,12 @@
      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 = {
+        # Necessary for situations where flake gets included multiple times
+        key = builtins.hashString "sha256" (builtins.path { path = self.sourceInfo.outPath; name = "source"; });
+        options = {
            services.opendmarc = {
              enable = lib.mkOption {
                type = lib.types.bool;