mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: java-flatlaf: Link library with libjawt.so.
* gnu/packages/java-graphics.scm (java-flatlaf)[arguments]: Add link options. Change-Id: I2306e7ea4c2ca9f0f20eeca107b09fa41304a8df
This commit is contained in:
parent
6ec2888ff7
commit
886ed061d7
1 changed files with 20 additions and 0 deletions
|
@ -187,6 +187,24 @@ (define-public java-flatlaf
|
||||||
("aarch64-linux" "aarch64")
|
("aarch64-linux" "aarch64")
|
||||||
("x86_64-linux" "x86_64")
|
("x86_64-linux" "x86_64")
|
||||||
(_ "generic")))
|
(_ "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
|
(filename
|
||||||
(string-append "libflatlaf-linux-" suffix ".so"))
|
(string-append "libflatlaf-linux-" suffix ".so"))
|
||||||
(target-dir
|
(target-dir
|
||||||
|
@ -197,6 +215,8 @@ (define-public java-flatlaf
|
||||||
"src/main/cpp/ApiVersion.cpp"
|
"src/main/cpp/ApiVersion.cpp"
|
||||||
"src/main/cpp/X11WmUtils.cpp"
|
"src/main/cpp/X11WmUtils.cpp"
|
||||||
"-Isrc/main/headers"
|
"-Isrc/main/headers"
|
||||||
|
"-ljawt"
|
||||||
|
(string-append "-L" jdk lib)
|
||||||
(string-append "-I" jdk "/include")
|
(string-append "-I" jdk "/include")
|
||||||
(string-append "-I" jdk "/include/linux")
|
(string-append "-I" jdk "/include/linux")
|
||||||
"-o" filename)
|
"-o" filename)
|
||||||
|
|
Loading…
Reference in a new issue