From cf89fa8eb960c964b9d0095e7efd200bebb69d2e Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Fri, 17 Feb 2023 23:44:47 +0100 Subject: [PATCH] load matrix-lib directly inside module To enable use with non-flakes --- flake.nix | 2 +- synapse-module/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 39d57d3..4372cfa 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ outputs = { self, nixpkgs-lib }: { nixosModules = { - synapse = import ./synapse-module { matrix-lib = self.lib; }; + synapse = import ./synapse-module; }; lib = import ./lib.nix { lib = nixpkgs-lib.lib; }; }; diff --git a/synapse-module/default.nix b/synapse-module/default.nix index 3c7c497..598f9fa 100644 --- a/synapse-module/default.nix +++ b/synapse-module/default.nix @@ -1,5 +1,5 @@ -{ matrix-lib }: { pkgs, lib, config, ... }: +{ matrix-lib ? (import ../lib.nix { inherit lib; }) }: let cfg = config.services.matrix-synapse-next; wcfg = cfg.workers;