small cleanup: shorter attribute names, move patchfiles into root, etc.

1 files changed, 7 insertions, 7 deletions

diff --git a/wapkgs.nix b/wapkgs.nix
index 6f7a0c1..cf6fef8 100644
--- a/wapkgs.nix
+++ b/wapkgs.nix
@@ -27,7 +27,7 @@ let
   };
   wapkgs =
     pkgs.lib.fix (self: let
-      mkWorkadventureset = waSelf: workadventuresrc: name:
+      mkWorkadventureSet = waSelf: workadventuresrc: name:
         let
           callWaPackage = path: pkgs.lib.callPackageWith
              # some parts of workadventure depend on other parts of workadventure
@@ -43,12 +43,12 @@ let
             maps = callWaPackage ./maps {};
           };
     in pkgs // rec {
-      workadventure-tcm = mkWorkadventureset workadventure-tcm (patchSources tcm [ ./front/tcm.patch ]) "tcm";
-      workadventure-fediventure = mkWorkadventureset workadventure-fediventure fediventure "fediventure";
-      workadventure-xce = mkWorkadventureset workadventure-xce (patchSources xce [ ./front/xce.patch ]) "xce";
+      tcm = mkWorkadventureSet tcm (patchSources tcm [ ./tcm.patch ]) "tcm";
+      fediventure = mkWorkadventureSet fediventure fediventure "fediventure";
+      xce = mkWorkadventureSet xce (patchSources xce [ ./xce.patch ]) "xce";
     });
 in {
-  workadventure-tcm = wapkgs.workadventure-tcm;
-  workadventure-fediventure = wapkgs.workadventure-fediventure;
-  workadventure-xce = wapkgs.workadventure-xce;
+  workadventure-tcm = wapkgs.tcm;
+  workadventure-fediventure = wapkgs.fediventure;
+  workadventure-xce = wapkgs.xce;
 }