diff options
Diffstat (limited to 'pkgs/modrinth-app.nix')
| -rw-r--r-- | pkgs/modrinth-app.nix | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/pkgs/modrinth-app.nix b/pkgs/modrinth-app.nix index 6693048..95a143b 100644 --- a/pkgs/modrinth-app.nix +++ b/pkgs/modrinth-app.nix @@ -10,9 +10,11 @@ glib-networking, jdk8, jdk17, + jdk21, jdks ? [ jdk8 jdk17 + jdk21 ], libGL, libpulseaudio, @@ -31,31 +33,33 @@ symlinkJoin rec { glib-networking ]; - nativeBuildInputs = [wrapGAppsHook]; + nativeBuildInputs = [ + wrapGAppsHook + ]; + + runtimeDependencies = lib.optionalString stdenv.isLinux (lib.makeLibraryPath [ + addOpenGLRunpath.driverLink + flite # narrator support - postBuild = let - runtimeDependencies = [ - addOpenGLRunpath.driverLink - flite # narrator support + udev # oshi - udev # oshi + # lwjgl + libGL + libpulseaudio + stdenv.cc.cc.lib + xorg.libX11 + xorg.libXcursor + xorg.libXext + xorg.libXxf86vm + xorg.libXrandr + ]); - # lwjgl - libGL - libpulseaudio - stdenv.cc.cc.lib - xorg.libX11 - xorg.libXcursor - xorg.libXext - xorg.libXxf86vm - xorg.libXrandr - ]; - in '' + postBuild = '' gappsWrapperArgs+=( --prefix PATH : ${lib.makeSearchPath "bin/java" jdks} ${lib.optionalString stdenv.isLinux '' - --set LD_LIBRARY_PATH ${lib.makeLibraryPath runtimeDependencies} --prefix PATH : ${lib.makeBinPath [xorg.xrandr]} + --set LD_LIBRARY_PATH $runtimeDependencies ''} ) |