branch master updated: gnu: java-flatlaf: Link library with libjawt.so.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 886ed061d7 gnu: java-flatlaf: Link library with libjawt.so.
886ed061d7 is described below

commit 886ed061d7c57eb9d707b2af2c87402b86becf70
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Apr 6 00:40:59 2024 +0200

    gnu: java-flatlaf: Link library with libjawt.so.
    
    * gnu/packages/java-graphics.scm (java-flatlaf)[arguments]: Add link 
options.
    
    Change-Id: I2306e7ea4c2ca9f0f20eeca107b09fa41304a8df
---
 gnu/packages/java-graphics.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/java-graphics.scm b/gnu/packages/java-graphics.scm
index 1e551ae897..d62d082b1d 100644
--- a/gnu/packages/java-graphics.scm
+++ b/gnu/packages/java-graphics.scm
@@ -187,6 +187,24 @@ ascii art drawings that contain characters that resemble 
lines like @samp{|}
                                  ("aarch64-linux" "aarch64")
                                  ("x86_64-linux" "x86_64")
                                  (_ "generic")))
+                     (lib #$(match (%current-system)
+                              ("i686-linux"
+                               "/lib/i386")
+                              ("x86_64-linux"
+                               "/lib/amd64")
+                              ("armhf-linux"
+                               "/lib/arm")
+                              ("aarch64-linux"
+                               "/lib/aarch64")
+                              ("powerpc-linux"
+                               "/lib/ppc")
+                              ;; We need a catch-all, dropping
+                              ;; '-linux' works in most cases.
+                              (_
+                               (string-append
+                                "/lib/"
+                                (string-drop-right
+                                 (%current-system) 6)))))
                      (filename
                       (string-append "libflatlaf-linux-" suffix ".so"))
                      (target-dir
@@ -197,6 +215,8 @@ ascii art drawings that contain characters that resemble 
lines like @samp{|}
                           "src/main/cpp/ApiVersion.cpp"
                           "src/main/cpp/X11WmUtils.cpp"
                           "-Isrc/main/headers"
+                          "-ljawt"
+                          (string-append "-L" jdk lib)
                           (string-append "-I" jdk "/include")
                           (string-append "-I" jdk "/include/linux")
                           "-o" filename)