aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2021-02-26 22:17:59 +0100
committerstuebinm2021-02-26 22:17:59 +0100
commitb0d082051d769a1de60999807be75d5067f06e40 (patch)
tree6bfdee6184a579bd27bd573beba9d09f68994581
parent7352984a5c3bc35f20184ddff97daea93f6b3738 (diff)
remove overlay
(it refused to evaluate on another server for an unknown reason, and instead led to infinite recursion)
Diffstat (limited to '')
-rw-r--r--overlay.nix21
-rw-r--r--wapkgs.nix23
-rw-r--r--workadventure.nix4
3 files changed, 25 insertions, 23 deletions
diff --git a/overlay.nix b/overlay.nix
deleted file mode 100644
index 3acdc30..0000000
--- a/overlay.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-self: super:
-
-let
- inherit (self) callPackage;
- workadventuresrc = self.fetchFromGitHub {
- owner = "thecodingmachine";
- repo = "workadventure";
- rev = "6e9c71598004dc9cbab9418efb3c0ac892da7ca2";
- sha256 = "0rvra0dy631al4aylacyqldkyd6biawz2shsikgcy30nv5lzc78c";
- };
- callWaPackage = path: callPackage (import path workadventuresrc);
-in {
- workadventure = {
- back = callWaPackage ./back {};
- pusher = callWaPackage ./pusher {};
- messages = callWaPackage ./messages {};
- front = callWaPackage ./front {};
- uploader = callWaPackage ./uploader {};
- maps = callWaPackage ./maps {};
- };
-}
diff --git a/wapkgs.nix b/wapkgs.nix
new file mode 100644
index 0000000..5e84fb3
--- /dev/null
+++ b/wapkgs.nix
@@ -0,0 +1,23 @@
+{pkgs, lib, ...}:
+
+let
+ workadventuresrc = pkgs.fetchFromGitHub {
+ owner = "thecodingmachine";
+ repo = "workadventure";
+ rev = "6e9c71598004dc9cbab9418efb3c0ac892da7ca2";
+ sha256 = "0rvra0dy631al4aylacyqldkyd6biawz2shsikgcy30nv5lzc78c";
+ };
+in
+ lib.fix (self: let
+ callWaPackage = path: lib.callPackageWith self (import path workadventuresrc);
+ in pkgs // {
+ workadventure = {
+ back = callWaPackage ./back {};
+ pusher = callWaPackage ./pusher {};
+ messages = callWaPackage ./messages {};
+ front = callWaPackage ./front {};
+ uploader = callWaPackage ./uploader {};
+ maps = callWaPackage ./maps {};
+ };
+ })
+
diff --git a/workadventure.nix b/workadventure.nix
index 49227aa..3ec06b9 100644
--- a/workadventure.nix
+++ b/workadventure.nix
@@ -146,7 +146,8 @@ in
options = {
services.workadventure = mkOption {
type = types.attrsOf (types.submodule (import ./instance-options.nix {
- inherit config lib pkgs;
+ inherit config lib;
+ pkgs = import ./overlay.nix {inherit pkgs lib;};
}));
default = {};
description = "Declarative WorkAdventure instance config";
@@ -159,6 +160,5 @@ in
inherit virtualHosts;
enable = mkDefault true;
};
- nixpkgs.overlays = [ (import ./overlay.nix) ];
};
}