From 4a124c9dafc3f31c4bbbf34f47452f629d5752f0 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 10 Apr 2024 22:30:41 -0400
Subject: modrinth-app: unstable-2024-04-07 -> 0.7.1-unstable-2024-04-25

---
 pkgs/modrinth-app.nix | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'pkgs/modrinth-app.nix')

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
     ''}
     )
 
-- 
cgit v1.2.3