packages/minecraft: add alsa-lib to inputs for audio

1 files changed, 82 insertions, 74 deletions

diff --git a/epistemia/packages/minecraft.scm b/epistemia/packages/minecraft.scm
index 4d7dc40..b5e95cf 100644
--- a/epistemia/packages/minecraft.scm
+++ b/epistemia/packages/minecraft.scm
@@ -4,6 +4,7 @@
   #:use-module (gnu packages bash)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages jemalloc)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages gl)
@@ -17,79 +18,86 @@
 
 (define-public prismlauncher
   (package
-    (name "prismlauncher")
-    (version "9.4")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/PrismLauncher/PrismLauncher")
-                    (recursive? #t)
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "0xq2znwb39qnn5hm0bqd4kwp02glkhfpwq64sxvryaiakhim5avp"))))
-    (build-system cmake-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'patch-paths
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out            (assoc-ref outputs "out"))
-                    (bin            (string-append out "/bin/prismlauncher"))
-                    (xrandr         (assoc-ref inputs "xrandr"))
-                    (qtwayland      (assoc-ref inputs "qtwayland"))
-                    (qtsvg          (assoc-ref inputs "qtsvg")))
-               (wrap-program bin
-                 `("PATH" ":" prefix (,(string-append xrandr "/bin")))
-                 `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (package)
-                                                       (string-append package "/lib/qt6/plugins"))
-                                                     (list qtwayland qtsvg)))
-                 `("LD_LIBRARY_PATH" ":" prefix
-                   (,@(map (lambda (dep)
-                             (string-append (assoc-ref inputs dep)
-                                            "/lib"))
-                           '("libx11" "libxext" "libxcursor"
-                             "libxrandr" "libxxf86vm" "mesa"
-                             "glfw" "openal" "jemalloc")))))
-               #t))))))
-    (native-inputs (list extra-cmake-modules))
-    (inputs (list bash-minimal ; for wrap-program
-                  zlib
-                  qtbase
-                  qt5compat
-                  qtnetworkauth
-                  qtwayland
-                  qtsvg
-                  xrandr
-                  libx11
-                  libxext
-                  libxcursor
-                  libxrandr
-                  libxxf86vm
-                  mesa
-                  glfw
-                  openal
-                  jemalloc))
-    (propagated-inputs (list `(,openjdk17 "jdk") `(,openjdk25 "jdk")))
-    (home-page "https://prismlauncher.org/")
-    (synopsis "Free, open source launcher for Minecraft")
-    (description
-     "Allows you to have multiple, separate instances of Minecraft (each with
+   (name "prismlauncher")
+   (version "9.4")
+   (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "https://github.com/PrismLauncher/PrismLauncher")
+                  (recursive? #t)
+                  (commit version)))
+            (file-name (git-file-name name version))
+            (sha256
+             (base32
+              "1xxgyx0z5r3hk3yk4gglbfwvq2qk1j9a0dkrv55j4vrlkni79nrm"))))
+   (build-system cmake-build-system)
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+                     (add-after 'install 'patch-paths
+                                (lambda* (#:key inputs outputs #:allow-other-keys)
+                                  (let* ((out            (assoc-ref outputs "out"))
+                                         (bin            (string-append out "/bin/prismlauncher"))
+                                         (xrandr         (assoc-ref inputs "xrandr"))
+                                         (qtwayland      (assoc-ref inputs "qtwayland"))
+                                         (qtsvg          (assoc-ref inputs "qtsvg"))
+                                         (jdk17          (assoc-ref inputs "jdk17"))
+                                         (jdk25          (assoc-ref inputs "jdk25")))
+                                    (wrap-program bin
+                                                  `("JAVA_HOME" = (,jdk25))
+                                                  `("PATH" ":" prefix (,(string-append xrandr "/bin")
+                                                                       ,(string-append jdk17 "/bin")
+                                                                       ,(string-append jdk25 "/bin")))
+                                                  `("QT_PLUGIN_PATH" ":" prefix ,(map (lambda (package)
+                                                                                        (string-append package "/lib/qt6/plugins"))
+                                                                                      (list qtwayland qtsvg)))
+                                                  `("LD_LIBRARY_PATH" ":" prefix
+                                                    (,@(map (lambda (dep)
+                                                              (string-append (assoc-ref inputs dep)
+                                                                             "/lib"))
+                                                            '("libx11" "libxext" "libxcursor"
+                                                              "libxrandr" "libxxf86vm" "mesa"
+                                                              "glfw" "openal" "jemalloc" "alsa-lib")))))
+                                    #t))))))
+   (native-inputs (list extra-cmake-modules))
+   (inputs
+    `(("bash" ,bash-minimal)
+      ("zlib" ,zlib)
+      ("qtbase" ,qtbase)
+      ("qt5compat" ,qt5compat)
+      ("qtnetworkauth" ,qtnetworkauth)
+      ("qtwayland" ,qtwayland)
+      ("qtsvg" ,qtsvg)
+      ("xrandr" ,xrandr)
+      ("libx11" ,libx11)
+      ("libxext" ,libxext)
+      ("libxcursor" ,libxcursor)
+      ("libxrandr" ,libxrandr)
+      ("libxxf86vm" ,libxxf86vm)
+      ("mesa" ,mesa)
+      ("glfw" ,glfw)
+      ("openal" ,openal)
+      ("alsa-lib" ,alsa-lib)
+      ("jemalloc" ,jemalloc)
+      ("jdk17" ,openjdk17 "jdk")
+      ("jdk25" ,openjdk25 "jdk")))
+   (home-page "https://prismlauncher.org/")
+   (synopsis "Free, open source launcher for Minecraft")
+   (description
+    "Allows you to have multiple, separate instances of Minecraft (each with
 their own mods, texture packs, saves, etc), and helps you manage them and
 their associated options with a simple interface.")
-    (license (list license:gpl3          ; PolyMC, launcher
-                   license:expat         ; MinGW runtime, lionshead, tomlc99
-                   license:lgpl3         ; Qt 5/6
-                   license:lgpl3+        ; libnbt++
-                   license:lgpl2.1+      ; rainbow (KGuiAddons)
-                   license:isc           ; Hoedown
-                   license:silofl1.1     ; Material Design Icons
-                   license:lgpl2.1       ; Quazip
-                   license:public-domain ; xz-minidec, murmur2, xz-embedded
-                   license:bsd-3         ; ColumnResizer, O2 (Katabasis fork),
-                                         ; gamemode, localpeer
-                   license:asl2.0        ; classparser, systeminfo
-                   ;; Batch icon set:
-                   (non-license:nonfree "file://COPYING.md")))))
-
+   (license (list license:gpl3          ; PolyMC, launcher
+                  license:expat         ; MinGW runtime, lionshead, tomlc99
+                  license:lgpl3         ; Qt 5/6
+                  license:lgpl3+        ; libnbt++
+                  license:lgpl2.1+      ; rainbow (KGuiAddons)
+                  license:isc           ; Hoedown
+                  license:silofl1.1     ; Material Design Icons
+                  license:lgpl2.1       ; Quazip
+                  license:public-domain ; xz-minidec, murmur2, xz-embedded
+                  license:bsd-3         ; ColumnResizer, O2 (Katabasis fork),
+                                        ; gamemode, localpeer
+                  license:asl2.0        ; classparser, systeminfo
+                  ;; Batch icon set:
+                  (non-license:nonfree "file://COPYING.md")))))