diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix
index 61e86445fe4..134d3721581 100644
--- a/pkgs/games/forge-mtg/default.nix
+++ b/pkgs/games/forge-mtg/default.nix
@@ -9,13 +9,13 @@
}:
let
- version = "1.6.53";
+ version = "1.6.56";
src = fetchFromGitHub {
owner = "Card-Forge";
repo = "forge";
rev = "forge-${version}";
- sha256 = "sha256-tNPG90mw8HZjp37YJ9JQlOBiVNPRo6xuNur651Adva8=";
+ hash = "sha256-VB/ToTq1XwHPEUNmbocwUoCP4DfyAFdlRAwxrx4tNJU=";
};
# launch4j downloads and runs a native binary during the package phase.
@@ -46,7 +46,7 @@ let
outputHashAlgo = "sha256";
outputHashMode = "recursive";
- outputHash = "sha256-6FTbYXaF3rBIZov2WJxjG/ovmvimjXFPaFchAduVzI8=";
+ outputHash = "sha256-aSNqAWbLebmiYnByyw5myc7eivzpP2STStz6qUUMw90=";
};
in stdenv.mkDerivation {
@@ -68,7 +68,9 @@ in stdenv.mkDerivation {
cp -a \
forge-gui-desktop/target/forge.sh \
forge-gui-desktop/target/forge-gui-desktop-${version}-jar-with-dependencies.jar \
- forge-adventure/target/forge-adventure.sh \
+ forge-gui-mobile-dev/target/forge-adventure.sh \
+ forge-gui-mobile-dev/target/forge-gui-mobile-dev-${version}-jar-with-dependencies.jar \
+ forge-adventure/target/forge-adventure-editor.sh \
forge-adventure/target/forge-adventure-${version}-jar-with-dependencies.jar \
forge-gui/res \
$out/share/forge
@@ -76,7 +78,7 @@ in stdenv.mkDerivation {
'';
preFixup = ''
- for commandToInstall in forge forge-adventure; do
+ for commandToInstall in forge forge-adventure forge-adventure-editor; do
chmod 555 $out/share/forge/$commandToInstall.sh
makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \
--prefix PATH : ${lib.makeBinPath [ coreutils openjdk gnused ]} \
diff --git a/pkgs/games/forge-mtg/no-launch4j.patch b/pkgs/games/forge-mtg/no-launch4j.patch
index ea4d674be17..7e9d9f4790a 100644
--- a/pkgs/games/forge-mtg/no-launch4j.patch
+++ b/pkgs/games/forge-mtg/no-launch4j.patch
@@ -1,8 +1,8 @@
diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml
-index 4d81b150e0..80dd1e04cb 100644
+index b35356ea76..b7ab1c775b 100644
--- a/forge-adventure/pom.xml
+++ b/forge-adventure/pom.xml
-@@ -41,131 +41,6 @@
+@@ -47,131 +47,6 @@
@@ -19,11 +19,11 @@ index 4d81b150e0..80dd1e04cb 100644
-
-
- gui
-- ${project.build.directory}/forge-adventure-java8.exe
+- ${project.build.directory}/forge-adventure-editor-java8.exe
- ${project.build.finalName}-jar-with-dependencies.jar
- true
- forge
-- src/main/config/forge-adventure.ico
+- src/main/config/forge-adventure-editor.ico
-
- forge.adventure.Main
- false
@@ -51,9 +51,9 @@ index 4d81b150e0..80dd1e04cb 100644
-
- 1.0.0.0
-
-- forge-adventure
-- forge-adventure
-- forge-adventure-java8.exe
+- forge-adventure-editor
+- forge-adventure-editor
+- forge-adventure-editor-java8.exe
-
-
-
@@ -66,12 +66,12 @@ index 4d81b150e0..80dd1e04cb 100644
-
-
- gui
-- ${project.build.directory}/forge-adventure.exe
+- ${project.build.directory}/forge-adventure-editor.exe
- ${project.build.finalName}-jar-with-dependencies.jar
- true
- forge
- https://www.oracle.com/java/technologies/downloads/
-- src/main/config/forge-adventure.ico
+- src/main/config/forge-adventure-editor.ico
-
- forge.adventure.Main
- false
@@ -121,9 +121,9 @@ index 4d81b150e0..80dd1e04cb 100644
-
- 1.0.0.0
-
-- forge-adventure
-- forge-adventure
-- forge-adventure.exe
+- forge-adventure-editor
+- forge-adventure-editor
+- forge-adventure-editor.exe
-
-
-
@@ -135,10 +135,10 @@ index 4d81b150e0..80dd1e04cb 100644
com.google.code.maven-replacer-plugin
replacer
diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
-index 218e641096..e8d0905a3d 100644
+index 3b74663b04..f0e324b69c 100644
--- a/forge-gui-desktop/pom.xml
+++ b/forge-gui-desktop/pom.xml
-@@ -231,60 +231,6 @@
+@@ -282,59 +282,6 @@
windows-linux-release
@@ -195,11 +195,10 @@ index 218e641096..e8d0905a3d 100644
-
-
-
--
+
org.apache.maven.plugins
- maven-antrun-plugin
-@@ -396,131 +342,6 @@
+@@ -447,130 +394,6 @@
windows-linux
@@ -327,7 +326,141 @@ index 218e641096..e8d0905a3d 100644
-
-
-
--
+
org.apache.maven.plugins
- maven-antrun-plugin
+diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml
+index e7439c1e3a..de0cbc16a1 100644
+--- a/forge-gui-mobile-dev/pom.xml
++++ b/forge-gui-mobile-dev/pom.xml
+@@ -64,130 +64,6 @@
+
+
+
+-
+- com.akathist.maven.plugins.launch4j
+- launch4j-maven-plugin
+- 1.7.25
+-
+-
+- l4j-adv
+- package
+-
+- launch4j
+-
+-
+- gui
+- ${project.build.directory}/forge-adventure-java8.exe
+- ${project.build.finalName}-jar-with-dependencies.jar
+- true
+- forge
+- src/main/config/forge-adventure.ico
+-
+- forge.app.Main
+- false
+- anything
+-
+-
+- 1.8.0
+- 4096
+-
+- -Dfile.encoding=UTF-8
+-
+-
+-
+-
+- 1.0.0.0
+-
+-
+- 1.0.0.0
+-
+- Forge
+- Forge
+-
+- 1.0.0.0
+-
+-
+- 1.0.0.0
+-
+- forge-adventure
+- forge-adventure
+- forge-adventure-java8.exe
+-
+-
+-
+-
+-
+- l4j-adv2
+- package
+-
+- launch4j
+-
+-
+- gui
+- ${project.build.directory}/forge-adventure.exe
+- ${project.build.finalName}-jar-with-dependencies.jar
+- true
+- forge
+- https://www.oracle.com/java/technologies/downloads/
+- src/main/config/forge-adventure.ico
+-
+- forge.app.Main
+- false
+- anything
+-
+-
+- 11.0.1
+- jdkOnly
+- 4096
+-
+- -Dfile.encoding=UTF-8
+- --add-opens java.base/java.lang=ALL-UNNAMED
+- --add-opens java.base/java.math=ALL-UNNAMED
+- --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
+- --add-opens java.base/java.nio=ALL-UNNAMED
+- --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+- --add-opens java.base/java.util=ALL-UNNAMED
+- --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+- --add-opens java.base/java.text=ALL-UNNAMED
+- --add-opens java.desktop/java.awt=ALL-UNNAMED
+- --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+- --add-opens java.desktop/java.awt.image=ALL-UNNAMED
+- --add-opens java.desktop/java.awt.color=ALL-UNNAMED
+- --add-opens java.desktop/sun.awt.image=ALL-UNNAMED
+- --add-opens java.desktop/javax.swing=ALL-UNNAMED
+- --add-opens java.desktop/javax.swing.border=ALL-UNNAMED
+- --add-opens java.desktop/javax.swing.event=ALL-UNNAMED
+- --add-opens java.desktop/sun.swing=ALL-UNNAMED
+- --add-opens java.desktop/java.beans=ALL-UNNAMED
+- --add-opens java.base/java.util.concurrent=ALL-UNNAMED
+- --add-opens java.base/java.net=ALL-UNNAMED
+- -Dio.netty.tryReflectionSetAccessible=true
+-
+-
+-
+-
+- 1.0.0.0
+-
+-
+- 1.0.0.0
+-
+- Forge
+- Forge
+-
+- 1.0.0.0
+-
+-
+- 1.0.0.0
+-
+- forge-adventure
+- forge-adventure
+- forge-adventure.exe
+-
+-
+-
+-
+-
+-
+
+ maven-assembly-plugin
+