aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--instance-options.nix10
-rw-r--r--workadventure.nix8
2 files changed, 10 insertions, 8 deletions
diff --git a/instance-options.nix b/instance-options.nix
index 50d7bdc..a2e77be 100644
--- a/instance-options.nix
+++ b/instance-options.nix
@@ -4,6 +4,16 @@
with lib;
with pkgs;
+let
+ wapkgs = let
+ src = pkgs.fetchgit {
+ url = "https://gitlab.infra4future.de/stuebinm/workadventure-nix";
+ rev = "7ec4c291d8ec93bc205af5c238dfe6a5176f4da4";
+ sha256 = "1372iwwbw7ji3v1wx3ncx9xiwnmjhahb8ivxcg8ykkci80hj0ci5";
+ };
+ in import "${src}/test.nix" {};
+in
+with wapkgs;
{
options = rec {
backend = {
diff --git a/workadventure.nix b/workadventure.nix
index 4fef36e..449c5a1 100644
--- a/workadventure.nix
+++ b/workadventure.nix
@@ -7,13 +7,6 @@ with lib;
let
cfg = config.services.workadventure;
- workadventureOverlay = let
- src = pkgs.fetchgit {
- url = "https://gitlab.infra4future.de/stuebinm/workadventure-nix";
- rev = "7ec4c291d8ec93bc205af5c238dfe6a5176f4da4";
- sha256 = "1372iwwbw7ji3v1wx3ncx9xiwnmjhahb8ivxcg8ykkci80hj0ci5";
- };
- in import "${src}/overlay.nix";
urls = instanceConfig: if instanceConfig.nginx.domain != null then {
api = instanceConfig.nginx.domain + instanceConfig.frontend.urls.api;
@@ -156,6 +149,5 @@ in {
inherit virtualHosts;
enable = mkDefault true;
};
- nixpkgs.overlays = [ workadventureOverlay ];
};
}