Commit Graph

55 Commits

Author SHA1 Message Date
Florian Klink
d025091b35 glew: enable both EGL and GLX
Re-roll of https://github.com/NixOS/nixpkgs/pull/328907, but this time
adding the patch from ArchLinux, which keeps both EGL and GLX code paths
active.

Remove overrides where EGL was explicitly requested previously, as well
as the glew-egl package variant.

Add an alias for glew-egl, in case there's any users of this outside
of nixpkgs.
2024-08-11 15:11:22 +03:00
hand7s
cc0bc412a6 mindustry: add zenity to $PATH
Co-authored-by: Francesco Gazzetta <fgaz@fgaz.me>
2024-08-09 17:55:52 +00:00
chayleaf
da8cbf4778
mindustry: convert to gradle setup hook 2024-07-12 21:36:18 +07:00
Francesco Gazzetta
583466f8f6 mindustry: fix build with gradle 8.8
Fix breakage introduced in 084f8df2f3
2024-06-30 09:28:45 +02:00
Alexis Hildebrandt
755b915a15 treewide: Remove indefinite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"[Aa]n?' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Aa]n? (.)/\1\U\2/'
2024-06-09 23:07:45 +02:00
GY
8baf42676a mindustry: add .desktop category 2024-05-09 09:09:45 +00:00
Sandro Jäckel
16004d8546 mindustry: fix build by downgrading jdk 2024-03-21 10:01:35 +01:00
Olli Helenius
4436b851bc mindustry: match gradle and package JDK 2023-12-13 06:57:34 +00:00
Francesco Gazzetta
a169de11b1 mindustry: 145.1 -> 146 2023-09-05 20:09:04 +02:00
Tom Fitzhenry
ad44318e80 mindustry-server: enable on aarch64-linux 2023-07-23 12:32:39 +10:00
Francesco Gazzetta
d241e6a727
mindustry: 144.3 -> 145.1 (#238707) 2023-06-20 21:06:23 +02:00
Scott Worley
dfdb06dad3 mindustry-server: Fix 2023-05-24 10:12:18 -07:00
Francesco Gazzetta
2e831c6c8a mindustry: 143.1 -> 144.3 2023-05-23 08:33:26 +02:00
Francesco Gazzetta
ef5c1750c9
Merge pull request #221396 from rhendric/rhendric/mindustry
mindustry-wayland: set SDL environment variables
2023-05-14 17:06:28 +02:00
Ryan Hendrickson
729d2eea29 mindustry-wayland: set SDL environment variables
`SDL_VIDEODRIVER=wayland` seems to be a requirement for GLEW to
initialize when using glew-egl.

`SDL_VIDEO_WAYLAND_WMCLASS` associates the application with the .desktop
file (in GNOME Shell, at least, if not other Wayland desktops).
2023-04-21 04:23:40 -04:00
Francesco Gazzetta
e9315ee2b2 mindustry: 142 -> 143.1 2023-04-11 09:26:07 +02:00
Konstantin
27684f8832
mindustry: 141.2 -> 142 2023-03-07 20:53:50 +03:00
Francesco Gazzetta
cd0e49f419 mindustry: use SRI hashes 2023-01-15 13:11:37 +01:00
Francesco Gazzetta
cbe58afca0 nixosTests.mindustry: init 2023-01-15 13:11:37 +01:00
Tom
3fb55f3268 mindustry: 140.4 → 141.2 2023-01-13 20:18:57 -08:00
Scott Worley
138be4cfbb mindustry: More uniform source cleanup 2022-11-17 17:16:05 -08:00
Scott Worley
3cd3cbd2d3 mindustry: 126.2 → 140.4 2022-11-17 17:16:02 -08:00
ajs124
99466ee39e maintainers: remove petabyteboy
github account deleted
2022-06-29 00:52:12 +02:00
Robert Scott
3b445eacea treewide: set sourceProvenance for gradle-built packages
these presumably contain binary jars in their deps
2022-06-04 19:48:03 +01:00
Sergei Trofimovich
26e02c1972 mindustry: propagate more runtime depends
glew alone is not enough to propagate explicitly:

```
$ nix run nixpkgs#mindustry
[E] Failed to initialize discord. Enable debug logging for details.
[E] java.lang.ExceptionInInitializerError
        at arc.backend.sdl.SdlApplication.lambda$init$0(SdlApplication.java:73)
        at arc.backend.sdl.SdlApplication.check(SdlApplication.java:181)
        at arc.backend.sdl.SdlApplication.init(SdlApplication.java:73)
        at arc.backend.sdl.SdlApplication.<init>(SdlApplication.java:29)
        at mindustry.desktop.DesktopLauncher.main(DesktopLauncher.java:36)
Caused by: arc.util.ArcRuntimeException: Couldn't load shared library 'libsdl-arc64.so' for target: Linux, 64-bit
        at arc.util.SharedLibraryLoader.load(SharedLibraryLoader.java:85)
        at arc.backend.sdl.jni.SDL.<clinit>(SDL.java:142)
        ... 5 more
Caused by: arc.util.ArcRuntimeException: java.lang.UnsatisfiedLinkError: /tmp/arc/35a2b27b/libsdl-arc64.so: /nix/store/v8pdm5rd4f89ng08zgxryyil065g1dh2-SDL2-2.0.20/lib/libSDL2.so: cannot open shared object file: No such file or directory
        at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:288)
        at arc.util.SharedLibraryLoader.load(SharedLibraryLoader.java:81)
        ... 6 more
Caused by: java.lang.UnsatisfiedLinkError: /tmp/arc/35a2b27b/libsdl-arc64.so: /nix/store/v8pdm5rd4f89ng08zgxryyil065g1dh2-SDL2-2.0.20/lib/libSDL2.so: cannot open shared object file: No such file or directory
        at java.base/jdk.internal.loader.NativeLibraries.load(Native Method)
        at java.base/jdk.internal.loader.NativeLibraries$NativeLibraryImpl.open(NativeLibraries.java:383)
        at java.base/jdk.internal.loader.NativeLibraries.loadLibrary(NativeLibraries.java:227)
        at java.base/jdk.internal.loader.NativeLibraries.loadLibrary(NativeLibraries.java:169)
        at java.base/java.lang.ClassLoader.loadLibrary(ClassLoader.java:2407)
        at java.base/java.lang.Runtime.load0(Runtime.java:747)
        at java.base/java.lang.System.load(System.java:1857)
        at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:294)
        at arc.backend.sdl.jni.SDL$3.loadFile(SDL.java:140)
        at arc.util.SharedLibraryLoader.loadFile(SharedLibraryLoader.java:260)
        ... 7 more
```

Let's add all SDL and alsa-lib as well. Instead of using propagatedBuildInputs
let's embed store paths into a shell wrapper.
2022-04-30 22:18:43 +01:00
Leiser Fernández Gallo
6a54835299 mindustry: Set ALSA_PLUGIN_DIR environment variable
Without it, there is no audio.
2022-04-10 00:01:30 +02:00
K900
cb2cfba6f7 treewide: switch all desktop file generators to new API
Notably:
- remove explicit arguments that match the defaults
- convert everything to the right Nix types
2022-02-25 13:40:38 -08:00
Maximilian Huber
18914a9355 mindustry: 126.1 -> 126.2
Signed-off-by: Maximilian Huber <gh@maxhbr.de>
2021-12-08 15:34:15 +01:00
Rick van Schijndel
4179df352b mindustry: fix eval error due to #119444
The PR https://github.com/NixOS/nixpkgs/pull/119444 broke the build for mindustry
even further. This patch fixes that again so it evals and builds properly.
2021-11-23 23:41:24 +01:00
Rick van Schijndel
7824302dd0 mindustry: mitigate issue with missing glew
Fixes: https://github.com/NixOS/nixpkgs/issues/109798
2021-11-23 23:41:15 +01:00
Rick van Schijndel
19c06baf6c mindustry: unbreak by building with jdk15
Fixes: https://github.com/NixOS/nixpkgs/issues/128929
2021-11-23 23:41:14 +01:00
Lorenz Leutgeb
01f4c7ec88 gradle: Decouple gradleGen and JDK 2021-11-19 18:54:25 +01:00
Lorenz Leutgeb
43750fb958 gradle: add 7.3-rc-3, 6.8 -> 6.9.1 2021-11-02 09:39:36 +01:00
AndersonTorres
e9e5f5f84d Change all alsaLib references to alsa-lib 2021-06-10 01:12:49 -03:00
Milan Pässler
93ad4bae79 mindustry: mark as broken
The Mindustry source code makes heavy use of internal Java APIs that
were deprecated in Java 6 and removed in Java 16. It also makes use
of features that require Java >=14.
The author is not ready to provide compatibility with any
maintained Java version at this time.
2021-04-16 18:54:04 +02:00
Rick van Schijndel
39677da7a6
mindustry: 125.1 -> 126.1 (#115442)
packr doesn't seem to have been updated (since 2019-10-23)
soloud is not updated since the last version bump (still at b33dfc5)
2021-03-08 22:29:30 +01:00
Francesco Gazzetta
67bd9e900a mindustry,mindustry-server: 124.1 -> 125.1 2021-02-22 16:07:53 +01:00
Milan
9252a96805
mindustry, mindustry-server: 123.1 -> 124.1 (#112392) 2021-02-09 13:55:38 +01:00
Lorenz Leutgeb
54bf37a957 mindustry: Use Gradle 6.8 2021-01-30 14:43:44 +01:00
Francesco Gazzetta
9ce1caa63c
mindustry,mindustry-server: 122.1 -> 123.1 (#110793) 2021-01-25 19:39:38 +01:00
Milan
213286bb18
mindustry: fix desktop item (#109121)
- make pre- and post-{build,install} phases usable for the main derivation
- replace uses of stdenv.lib with just lib
- specify which buildInputs are only needed for the client
2021-01-12 20:17:11 +01:00
Milan
e614b5a2d0
mindustry: build Arc from source (#108274)
- reduce the buildPhase of the fixed-output dependencies derivation to
  only download all dependencies, instead of building the full thing.
- add wayland variant, which is linked against a different variant of
  the glew library to run natively using SDL_VIDEODRIVER=wayland
- use jdk (Java 15) instead of jre (Java 8) at runtime
- use new copyDesktopItems hook
2021-01-11 15:55:52 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Doron Behar
7aed38b8ab
Merge pull request #107547 from jerith666/openjdk-15 2021-01-06 16:02:45 +02:00
Francesco Gazzetta
35cbd224af mindustry: 122 -> 122.1 2021-01-01 18:13:55 +01:00
Francesco Gazzetta
6792a171e8
mindustry,mindustry-server: 121.4 -> 122 (#107646) 2020-12-28 17:03:31 +01:00
Matt McHenry
13e3d2bc4b openjdk: 14.0.2 -> 15.0.1
* update two explicit references to jdk14 to just jdk, which no longer
  points at jdk8 after #89731.

* patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the
  former now throws an error (after having been deprecated since jdk 9)
2020-12-26 11:58:06 -05:00
Francesco Gazzetta
15d67698c0 mindustry,mindustry-server: 120.2 -> 121.4 2020-12-20 23:23:19 +01:00
Francesco Gazzetta
298ddbb049 mindustry,mindustry-server: 120 -> 120.2 2020-12-02 13:53:31 +01:00
Francesco Gazzetta
5faf8cbfa5 mindustry,mindustry-server: mark as broken for darwin
There is a hash mismatch when built on darwin:
https://github.com/NixOS/nixpkgs/pull/105590#issuecomment-737120293
2020-12-02 13:52:19 +01:00