Pass through nixpkgs-Draupnir to container

3 files changed, 14 insertions, 2 deletions

diff --git a/flake.nix b/flake.nix
index 0dfa8b4..1b0358f 100755
--- a/flake.nix
+++ b/flake.nix
@@ -99,6 +99,7 @@
           ];
           specialArgs = {
             inherit home-manager;
+            inherit nixpkgs-Draupnir;
           };
         };
 
diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix
index fedf330..d7c9bcb 100755
--- a/host/Rory-nginx/configuration.nix
+++ b/host/Rory-nginx/configuration.nix
@@ -5,6 +5,7 @@
   grapevine,
   conduit,
   conduwuit,
+  nixpkgs-Draupnir,
   ...
 }:
 
@@ -75,7 +76,7 @@
   };
 
   containers."draupnir-cme" = import ./services/containers/draupnir-cme/container.nix {
-    inherit pkgs lib;
+    inherit pkgs lib nixpkgs-Draupnir;
   };
 
   system.stateVersion = "22.11"; # DO NOT EDIT!
diff --git a/host/Rory-nginx/services/containers/draupnir-cme/container.nix b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
index 84bacc0..1f72a05 100755
--- a/host/Rory-nginx/services/containers/draupnir-cme/container.nix
+++ b/host/Rory-nginx/services/containers/draupnir-cme/container.nix
@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  nixpkgs-Draupnir,
   ...
 }:
 
@@ -8,6 +9,7 @@
   privateNetwork = true;
   autoStart = true;
   specialArgs = {
+    inherit nixpkgs-Draupnir;
   };
   config =
     {
@@ -16,7 +18,15 @@
       ...
     }:
     {
-      imports = [ ./root.nix ];
+      imports = [ 
+        ./root.nix
+        "${nixpkgs-Draupnir}/nixos/modules/services/matrix/draupnir.nix"
+      ];
+      nixpkgs.overlays = [
+        (final: prev: {
+          draupnir = nixpkgs-Draupnir.legacyPackages.${pkgs.stdenv.hostPlatform.system}.draupnir;
+        })
+      ];
     };
   hostAddress = "192.168.100.16";
   localAddress = "192.168.100.17";