From 787a3198d3dcc71c2900fc3847af1a0c1144ccda Mon Sep 17 00:00:00 2001
From: stuebinm
Date: Sun, 28 Mar 2021 21:37:43 +0200
Subject: Move sources into their own set.

This is a patch by hxchn. No idea why it wants them all in a set, but I don't
see a reason why not, so here it is.
---
 wapkgs.nix | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/wapkgs.nix b/wapkgs.nix
index cf6fef8..1fef2b0 100644
--- a/wapkgs.nix
+++ b/wapkgs.nix
@@ -7,23 +7,25 @@ let
     buildPhase = "mkdir -p $out";
     installPhase = "cp -r * $out";
   };
-  tcm = pkgs.fetchFromGitHub {
-     owner = "thecodingmachine";
-     repo = "workadventure";
-     rev = "4966789b3b3abe8d00362553a827bc9a257ce6d3";
-     sha256 = "0nq6zg95wsq2ldqhi7w7alvb9krmzrqkgzq0m24cfvpm42agl1xc";
-  };
-  fediventure = pkgs.fetchFromGitLab {
-    owner = "fediventure";
-    repo = "workadventure";
-    rev = "e769e713c6058efac6959437df6a02da02b8e065";
-    sha256 = "13243az0b2w69wmbf5z0qnbd9rfixkj61c844c97sy2h136159yd";
-  };
-  xce = pkgs.fetchFromGitHub {
-    owner = "workadventure-xce";
-    repo = "workadventure-xce";
-    rev = "ba439ca6699a7e5751386d5bed5c44e375e12eb6";
-    sha256 = "1r6dpn8biisrqij5v2pg1vlifgvv93fnqppyp2l9wzls5am3rx6x";
+  sources = {
+    tcm = pkgs.fetchFromGitHub {
+      owner = "thecodingmachine";
+      repo = "workadventure";
+      rev = "4966789b3b3abe8d00362553a827bc9a257ce6d3";
+      sha256 = "0nq6zg95wsq2ldqhi7w7alvb9krmzrqkgzq0m24cfvpm42agl1xc";
+    };
+    fediventure = pkgs.fetchFromGitLab {
+      owner = "fediventure";
+      repo = "workadventure";
+      rev = "e769e713c6058efac6959437df6a02da02b8e065";
+      sha256 = "13243az0b2w69wmbf5z0qnbd9rfixkj61c844c97sy2h136159yd";
+    };
+    xce = pkgs.fetchFromGitHub {
+      owner = "workadventure-xce";
+      repo = "workadventure-xce";
+      rev = "ba439ca6699a7e5751386d5bed5c44e375e12eb6";
+      sha256 = "1r6dpn8biisrqij5v2pg1vlifgvv93fnqppyp2l9wzls5am3rx6x";
+    };
   };
   wapkgs =
     pkgs.lib.fix (self: let
@@ -43,9 +45,9 @@ let
             maps = callWaPackage ./maps {};
           };
     in pkgs // rec {
-      tcm = mkWorkadventureSet tcm (patchSources tcm [ ./tcm.patch ]) "tcm";
-      fediventure = mkWorkadventureSet fediventure fediventure "fediventure";
-      xce = mkWorkadventureSet xce (patchSources xce [ ./xce.patch ]) "xce";
+      tcm = mkWorkadventureSet tcm (patchSources sources.tcm [ ./tcm.patch ]) "tcm";
+      fediventure = mkWorkadventureSet fediventure sources.fediventure "fediventure";
+      xce = mkWorkadventureSet xce (patchSources sources.xce [ ./xce.patch ]) "xce";
     });
 in {
   workadventure-tcm = wapkgs.tcm;
-- 
cgit v1.2.3