diff options
| author | Mewp | 2021-01-10 23:55:57 +0100 |
|---|---|---|
| committer | Mewp | 2021-01-10 23:55:57 +0100 |
| commit | 0f3b3d4807b674d7f7ec83ab347f84839a87ffce (patch) | |
| tree | fd5dc1f62a8adf3ab7f924f65836c18c912bf9e0 | |
| parent | 09e8c81cc18f4781f59d22dd8ab1654c5b846de2 (diff) | |
Fix front env vars. Update env to a working WA version.
Diffstat (limited to '')
| -rw-r--r-- | front/default.nix | 18 | ||||
| -rw-r--r-- | front/yarn.nix | 16 |
2 files changed, 20 insertions, 14 deletions
diff --git a/front/default.nix b/front/default.nix index ecb5afb..d3276e7 100644 --- a/front/default.nix +++ b/front/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchFromGitLab , makeWrapper , workadventure-messages , yarn2nix-moretea @@ -8,15 +8,21 @@ , ... }: let - envVar = (name: lib.optionalAttrs (environment ? name) { name = environment.${name}; }); + envVar = (name: lib.optionalAttrs (environment ? ${name}) { ${name} = environment.${name}; }); envVars = envVar "DEBUG_MODE" // envVar "API_URL" // envVar "UPLOADER_URL" // envVar "ADMIN_URL" + // envVar "MAPS_URL" + // envVar "API_HOST" + // envVar "UPLOADER_HOST" + // envVar "ADMIN_HOST" + // envVar "MAPS_HOST" // envVar "API_PROTOCOL" // envVar "UPLOADER_PROTOCOL" // envVar "ADMIN_PROTOCOL" + // envVar "MAPS_PROTOCOL" // envVar "TURN_SERVER" // envVar "TURN_USER" // envVar "TURN_PASSWORD" @@ -26,12 +32,12 @@ in yarn2nix-moretea.mkYarnPackage (rec { pname = "workadventurefront"; version = "unstable"; - src = fetchFromGitHub + src = fetchFromGitLab { - owner = "thecodingmachine"; + owner = "fediventure"; repo = "workadventure"; - rev = "284846e8a59ec0d921189ac3a46e0eb5d1e14818"; - sha256 = "1f1vi226kas7x9y8zw810q5vg1ikn4bb6ha9vnzvqk9y7jlc1n8q"; + rev = "e77551c629b0412c808843f91d072a4ce7558d7f"; + sha256 = "1ikasdk2qhsrnh8x9sxvyjhzdiwmzimgs523cqysasz312yv4dfk"; } + "/front"; # NOTE: this is optional and generated dynamically if omitted diff --git a/front/yarn.nix b/front/yarn.nix index 02533a2..f094242 100644 --- a/front/yarn.nix +++ b/front/yarn.nix @@ -674,11 +674,11 @@ }; } { - name = "axios___axios_0.20.0.tgz"; + name = "axios___axios_0.21.1.tgz"; path = fetchurl { - name = "axios___axios_0.20.0.tgz"; - url = "https://registry.yarnpkg.com/axios/-/axios-0.20.0.tgz"; - sha1 = "057ba30f04884694993a8cd07fa394cff11c50bd"; + name = "axios___axios_0.21.1.tgz"; + url = "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz"; + sha1 = "22563481962f4d6bde9a76d516ef0e5d3c09b2b8"; }; } { @@ -4090,11 +4090,11 @@ }; } { - name = "phaser___phaser_3.24.1.tgz"; + name = "phaser___phaser_3.51.0.tgz"; path = fetchurl { - name = "phaser___phaser_3.24.1.tgz"; - url = "https://registry.yarnpkg.com/phaser/-/phaser-3.24.1.tgz"; - sha1 = "376e0c965d2a35af37c06ee78627dafbde5be017"; + name = "phaser___phaser_3.51.0.tgz"; + url = "https://registry.yarnpkg.com/phaser/-/phaser-3.51.0.tgz"; + sha1 = "b0c7ee2b21e795830d74f476dd30816a42b023bd"; }; } { |