commit 4e68c536a48ca9e2f703f507de9d9cbb1c981a7d · pyrox.dev/nixpkgs

pyrox.dev / nixpkgs

lol

fork atom

forge-mtg: 1.6.53 -> 1.6.56

Justin Lovinger 2 years ago 4e68c536 edbd1ea4

+159 -24

2 changed files

expand all

unified split

pkgs

games

forge-mtg

default.nix

no-launch4j.patch

+7 -5

pkgs/games/forge-mtg/default.nix

··· 9 9 }: 10 10 11 11 let 12 - version = "1.6.53"; 12 + version = "1.6.56"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "Card-Forge"; 16 16 repo = "forge"; 17 17 rev = "forge-${version}"; 18 - sha256 = "sha256-tNPG90mw8HZjp37YJ9JQlOBiVNPRo6xuNur651Adva8="; 18 + hash = "sha256-VB/ToTq1XwHPEUNmbocwUoCP4DfyAFdlRAwxrx4tNJU="; 19 19 }; 20 20 21 21 # launch4j downloads and runs a native binary during the package phase. ··· 46 46 47 47 outputHashAlgo = "sha256"; 48 48 outputHashMode = "recursive"; 49 - outputHash = "sha256-6FTbYXaF3rBIZov2WJxjG/ovmvimjXFPaFchAduVzI8="; 49 + outputHash = "sha256-aSNqAWbLebmiYnByyw5myc7eivzpP2STStz6qUUMw90="; 50 50 }; 51 51 52 52 in stdenv.mkDerivation { ··· 68 68 cp -a \ 69 69 forge-gui-desktop/target/forge.sh \ 70 70 forge-gui-desktop/target/forge-gui-desktop-${version}-jar-with-dependencies.jar \ 71 - forge-adventure/target/forge-adventure.sh \ 71 + forge-gui-mobile-dev/target/forge-adventure.sh \ 72 + forge-gui-mobile-dev/target/forge-gui-mobile-dev-${version}-jar-with-dependencies.jar \ 73 + forge-adventure/target/forge-adventure-editor.sh \ 72 74 forge-adventure/target/forge-adventure-${version}-jar-with-dependencies.jar \ 73 75 forge-gui/res \ 74 76 $out/share/forge ··· 76 78 ''; 77 79 78 80 preFixup = '' 79 - for commandToInstall in forge forge-adventure; do 81 + for commandToInstall in forge forge-adventure forge-adventure-editor; do 80 82 chmod 555 $out/share/forge/$commandToInstall.sh 81 83 makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \ 82 84 --prefix PATH : ${lib.makeBinPath [ coreutils openjdk gnused ]} \

+152 -19

pkgs/games/forge-mtg/no-launch4j.patch

··· 1 1 diff --git a/forge-adventure/pom.xml b/forge-adventure/pom.xml 2 - index 4d81b150e0..80dd1e04cb 100644 2 + index b35356ea76..b7ab1c775b 100644 3 3 --- a/forge-adventure/pom.xml 4 4 +++ b/forge-adventure/pom.xml 5 - @@ -41,131 +41,6 @@ 5 + @@ -47,131 +47,6 @@ 6 6 </configuration> 7 7 </plugin> 8 8 ··· 19 19 - </goals> 20 20 - <configuration> 21 21 - <headerType>gui</headerType> 22 - - <outfile>${project.build.directory}/forge-adventure-java8.exe</outfile> 22 + - <outfile>${project.build.directory}/forge-adventure-editor-java8.exe</outfile> 23 23 - <jar>${project.build.finalName}-jar-with-dependencies.jar</jar> 24 24 - <dontWrapJar>true</dontWrapJar> 25 25 - <errTitle>forge</errTitle> 26 - - <icon>src/main/config/forge-adventure.ico</icon> 26 + - <icon>src/main/config/forge-adventure-editor.ico</icon> 27 27 - <classPath> 28 28 - <mainClass>forge.adventure.Main</mainClass> 29 29 - <addDependencies>false</addDependencies> ··· 51 51 - <txtProductVersion> 52 52 - 1.0.0.0 53 53 - </txtProductVersion> 54 - - <productName>forge-adventure</productName> 55 - - <internalName>forge-adventure</internalName> 56 - - <originalFilename>forge-adventure-java8.exe</originalFilename> 54 + - <productName>forge-adventure-editor</productName> 55 + - <internalName>forge-adventure-editor</internalName> 56 + - <originalFilename>forge-adventure-editor-java8.exe</originalFilename> 57 57 - </versionInfo> 58 58 - </configuration> 59 59 - </execution> ··· 66 66 - </goals> 67 67 - <configuration> 68 68 - <headerType>gui</headerType> 69 - - <outfile>${project.build.directory}/forge-adventure.exe</outfile> 69 + - <outfile>${project.build.directory}/forge-adventure-editor.exe</outfile> 70 70 - <jar>${project.build.finalName}-jar-with-dependencies.jar</jar> 71 71 - <dontWrapJar>true</dontWrapJar> 72 72 - <errTitle>forge</errTitle> 73 73 - <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl> 74 - - <icon>src/main/config/forge-adventure.ico</icon> 74 + - <icon>src/main/config/forge-adventure-editor.ico</icon> 75 75 - <classPath> 76 76 - <mainClass>forge.adventure.Main</mainClass> 77 77 - <addDependencies>false</addDependencies> ··· 121 121 - <txtProductVersion> 122 122 - 1.0.0.0 123 123 - </txtProductVersion> 124 - - <productName>forge-adventure</productName> 125 - - <internalName>forge-adventure</internalName> 126 - - <originalFilename>forge-adventure.exe</originalFilename> 124 + - <productName>forge-adventure-editor</productName> 125 + - <internalName>forge-adventure-editor</internalName> 126 + - <originalFilename>forge-adventure-editor.exe</originalFilename> 127 127 - </versionInfo> 128 128 - </configuration> 129 129 - </execution> ··· 135 135 <groupId>com.google.code.maven-replacer-plugin</groupId> 136 136 <artifactId>replacer</artifactId> 137 137 diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml 138 - index 218e641096..e8d0905a3d 100644 138 + index 3b74663b04..f0e324b69c 100644 139 139 --- a/forge-gui-desktop/pom.xml 140 140 +++ b/forge-gui-desktop/pom.xml 141 - @@ -231,60 +231,6 @@ 141 + @@ -282,59 +282,6 @@ 142 142 <id>windows-linux-release</id> 143 143 <build> 144 144 <plugins> ··· 195 195 - </execution> 196 196 - </executions> 197 197 - </plugin> 198 - - 198 + 199 199 <plugin> 200 200 <groupId>org.apache.maven.plugins</groupId> 201 - <artifactId>maven-antrun-plugin</artifactId> 202 - @@ -396,131 +342,6 @@ 201 + @@ -447,130 +394,6 @@ 203 202 <id>windows-linux</id> 204 203 <build> 205 204 <plugins> ··· 327 326 -  328 327 - </executions> 329 328 - </plugin> 330 - - 329 + 331 330 <plugin> 332 331 <groupId>org.apache.maven.plugins</groupId> 333 - <artifactId>maven-antrun-plugin</artifactId> 332 + diff --git a/forge-gui-mobile-dev/pom.xml b/forge-gui-mobile-dev/pom.xml 333 + index e7439c1e3a..de0cbc16a1 100644 334 + --- a/forge-gui-mobile-dev/pom.xml 335 + +++ b/forge-gui-mobile-dev/pom.xml 336 + @@ -64,130 +64,6 @@ 337 + </replacements> 338 + </configuration> 339 + </plugin> 340 + - <plugin> 341 + - <groupId>com.akathist.maven.plugins.launch4j</groupId> 342 + - <artifactId>launch4j-maven-plugin</artifactId> 343 + - <version>1.7.25</version> 344 + - <executions> 345 + - <execution> 346 + - <id>l4j-adv</id> 347 + - <phase>package</phase> 348 + - <goals> 349 + - <goal>launch4j</goal> 350 + - </goals> 351 + - <configuration> 352 + - <headerType>gui</headerType> 353 + - <outfile>${project.build.directory}/forge-adventure-java8.exe</outfile> 354 + - <jar>${project.build.finalName}-jar-with-dependencies.jar</jar> 355 + - <dontWrapJar>true</dontWrapJar> 356 + - <errTitle>forge</errTitle> 357 + - <icon>src/main/config/forge-adventure.ico</icon> 358 + - <classPath> 359 + - <mainClass>forge.app.Main</mainClass> 360 + - <addDependencies>false</addDependencies> 361 + - <preCp>anything</preCp> 362 + - </classPath> 363 + - <jre> 364 + - <minVersion>1.8.0</minVersion> 365 + - <maxHeapSize>4096</maxHeapSize> 366 + - <opts> 367 + - <opt>-Dfile.encoding=UTF-8</opt> 368 + - </opts> 369 + - </jre> 370 + - <versionInfo> 371 + - <fileVersion> 372 + - 1.0.0.0 373 + - </fileVersion> 374 + - <txtFileVersion> 375 + - 1.0.0.0 376 + - </txtFileVersion> 377 + - <fileDescription>Forge</fileDescription> 378 + - <copyright>Forge</copyright> 379 + - <productVersion> 380 + - 1.0.0.0 381 + - </productVersion> 382 + - <txtProductVersion> 383 + - 1.0.0.0 384 + - </txtProductVersion> 385 + - <productName>forge-adventure</productName> 386 + - <internalName>forge-adventure</internalName> 387 + - <originalFilename>forge-adventure-java8.exe</originalFilename> 388 + - </versionInfo> 389 + - </configuration> 390 + - </execution> 391 + -  392 + - <execution> 393 + - <id>l4j-adv2</id> 394 + - <phase>package</phase> 395 + - <goals> 396 + - <goal>launch4j</goal> 397 + - </goals> 398 + - <configuration> 399 + - <headerType>gui</headerType> 400 + - <outfile>${project.build.directory}/forge-adventure.exe</outfile> 401 + - <jar>${project.build.finalName}-jar-with-dependencies.jar</jar> 402 + - <dontWrapJar>true</dontWrapJar> 403 + - <errTitle>forge</errTitle> 404 + - <downloadUrl>https://www.oracle.com/java/technologies/downloads/</downloadUrl> 405 + - <icon>src/main/config/forge-adventure.ico</icon> 406 + - <classPath> 407 + - <mainClass>forge.app.Main</mainClass> 408 + - <addDependencies>false</addDependencies> 409 + - <preCp>anything</preCp> 410 + - </classPath> 411 + - <jre> 412 + - <minVersion>11.0.1</minVersion> 413 + - <jdkPreference>jdkOnly</jdkPreference> 414 + - <maxHeapSize>4096</maxHeapSize> 415 + - <opts> 416 + - <opt>-Dfile.encoding=UTF-8</opt> 417 + - <opt>--add-opens java.base/java.lang=ALL-UNNAMED</opt> 418 + - <opt>--add-opens java.base/java.math=ALL-UNNAMED</opt> 419 + - <opt>--add-opens java.base/jdk.internal.misc=ALL-UNNAMED</opt> 420 + - <opt>--add-opens java.base/java.nio=ALL-UNNAMED</opt> 421 + - <opt>--add-opens=java.base/sun.nio.ch=ALL-UNNAMED</opt> 422 + - <opt>--add-opens java.base/java.util=ALL-UNNAMED</opt> 423 + - <opt>--add-opens java.base/java.lang.reflect=ALL-UNNAMED</opt> 424 + - <opt>--add-opens java.base/java.text=ALL-UNNAMED</opt> 425 + - <opt>--add-opens java.desktop/java.awt=ALL-UNNAMED</opt> 426 + - <opt>--add-opens java.desktop/java.awt.font=ALL-UNNAMED</opt> 427 + - <opt>--add-opens java.desktop/java.awt.image=ALL-UNNAMED</opt> 428 + - <opt>--add-opens java.desktop/java.awt.color=ALL-UNNAMED</opt> 429 + - <opt>--add-opens java.desktop/sun.awt.image=ALL-UNNAMED</opt> 430 + - <opt>--add-opens java.desktop/javax.swing=ALL-UNNAMED</opt> 431 + - <opt>--add-opens java.desktop/javax.swing.border=ALL-UNNAMED</opt> 432 + - <opt>--add-opens java.desktop/javax.swing.event=ALL-UNNAMED</opt> 433 + - <opt>--add-opens java.desktop/sun.swing=ALL-UNNAMED</opt> 434 + - <opt>--add-opens java.desktop/java.beans=ALL-UNNAMED</opt> 435 + - <opt>--add-opens java.base/java.util.concurrent=ALL-UNNAMED</opt> 436 + - <opt>--add-opens java.base/java.net=ALL-UNNAMED</opt> 437 + - <opt>-Dio.netty.tryReflectionSetAccessible=true</opt> 438 + - </opts> 439 + - </jre> 440 + - <versionInfo> 441 + - <fileVersion> 442 + - 1.0.0.0 443 + - </fileVersion> 444 + - <txtFileVersion> 445 + - 1.0.0.0 446 + - </txtFileVersion> 447 + - <fileDescription>Forge</fileDescription> 448 + - <copyright>Forge</copyright> 449 + - <productVersion> 450 + - 1.0.0.0 451 + - </productVersion> 452 + - <txtProductVersion> 453 + - 1.0.0.0 454 + - </txtProductVersion> 455 + - <productName>forge-adventure</productName> 456 + - <internalName>forge-adventure</internalName> 457 + - <originalFilename>forge-adventure.exe</originalFilename> 458 + - </versionInfo> 459 + - </configuration> 460 + - </execution> 461 + -  462 + - </executions> 463 + - </plugin> 464 + <plugin> 465 + <artifactId>maven-assembly-plugin</artifactId> 466 + <configuration>