aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2021-03-22 20:07:11 +0100
committerstuebinm2021-03-22 20:07:11 +0100
commitb666f59ffdb1e63f90650aafb2143b0062234731 (patch)
tree4507897a9a89f20267e1233473208cb5db045e40
parentad7262c2cf771f89ad4a29e02c628be3a9eb9597 (diff)
small cleanup: shorter attribute names, move patchfiles into root, etc.
-rw-r--r--tcm.patch (renamed from front/tcm.patch)0
-rw-r--r--wapkgs.nix14
-rw-r--r--xce.patch (renamed from front/xce.patch)0
3 files changed, 7 insertions, 7 deletions
diff --git a/front/tcm.patch b/tcm.patch
index e69de29..e69de29 100644
--- a/front/tcm.patch
+++ b/tcm.patch
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;
}
diff --git a/front/xce.patch b/xce.patch
index 38772d7..38772d7 100644
--- a/front/xce.patch
+++ b/xce.patch