aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2021-02-18 15:56:59 +0100
committerstuebinm2021-02-18 15:58:00 +0100
commit791fe2dce2374e1ff8b1cf4dc54bf9aac2b5c8a8 (patch)
tree680b93a1e48db753b81339e3c5bf948d58b5772c
parent60455e908ce725174818bafde0ecd2be7a0060d1 (diff)
Updated workadventure-nix sources & removed channel imports
(but not the actual workadventure version)
Diffstat (limited to '')
-rw-r--r--instance-options.nix4
-rw-r--r--workadventure-nix.nix8
-rw-r--r--workadventure.nix2
3 files changed, 6 insertions, 8 deletions
diff --git a/instance-options.nix b/instance-options.nix
index c685693..58cc99e 100644
--- a/instance-options.nix
+++ b/instance-options.nix
@@ -1,9 +1,9 @@
# Configuration options specific to a single workadventure instance.
-{ lib, config, ... }:
+{ lib, pkgs, config, ... }:
with lib;
-let workadventure = import ./workadventure-nix.nix { inherit lib; };
+let workadventure = import ./workadventure-nix.nix { inherit lib pkgs; };
in
{
options = rec {
diff --git a/workadventure-nix.nix b/workadventure-nix.nix
index ffd028f..6e13dd1 100644
--- a/workadventure-nix.nix
+++ b/workadventure-nix.nix
@@ -1,15 +1,13 @@
# WorkAdventure packaging effort by SuperSandro2000, not yet upstreamed into nixpkgs.
-{ lib, ... }:
+{ pkgs, lib, ... }:
let
- pkgs = import <nixpkgs> {};
-
src = pkgs.fetchgit {
url = "https://gitlab.infra4future.de/stuebinm/workadventure-nix";
- rev = "c46949747779b5e679774ceb23a530ed4736c52b";
- sha256 = "1z6qd7bjrc7map2nj3yzwqyvr16vk29fy08pdc9vvd4yid2lywv7";
+ rev = "bfae9d9bfa90a0189d943ca865fa046f510b9922";
+ sha256 = "160gc1yy6l5ynrx6679b6vwm1ivickymw75w3jfxk8idshsbjqw8";
};
# Use a fixed-point operator to build a nixpkgs-like structure that contains all
diff --git a/workadventure.nix b/workadventure.nix
index 1050023..189921c 100644
--- a/workadventure.nix
+++ b/workadventure.nix
@@ -107,7 +107,7 @@ in {
services.workadventure = rec {
instances = mkOption {
type = types.attrsOf (types.submodule (import ./instance-options.nix {
- inherit config lib;
+ inherit config lib pkgs;
}));
default = {};
description = "Declarative WorkAdventure instance config";