mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: icedtea-7: Use system lcms and pcsc.
* gnu/packages/java.scm (icedtea-7)[arguments]: Add configure flags to use our pcsc and lcms libraries. [inputs]: Add pcsc-lite. And use new style.
This commit is contained in:
parent
5c27e1f8a0
commit
dba1124bea
1 changed files with 25 additions and 22 deletions
|
@ -85,6 +85,7 @@
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages popt)
|
#:use-module (gnu packages popt)
|
||||||
#:use-module (gnu packages kerberos)
|
#:use-module (gnu packages kerberos)
|
||||||
|
#:use-module (gnu packages security-token)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
#:use-module (gnu packages texinfo)
|
#:use-module (gnu packages texinfo)
|
||||||
|
@ -1330,9 +1331,10 @@ bootstrapping purposes.")
|
||||||
(srfi srfi-26))
|
(srfi srfi-26))
|
||||||
|
|
||||||
#:configure-flags
|
#:configure-flags
|
||||||
;; TODO: package pcsc and sctp, and add to inputs
|
;; TODO: package sctp and add to inputs
|
||||||
`("--disable-system-pcsc"
|
`("--disable-system-sctp"
|
||||||
"--disable-system-sctp"
|
"--enable-system-pcsc"
|
||||||
|
"--enable-system-lcms"
|
||||||
"--enable-bootstrap"
|
"--enable-bootstrap"
|
||||||
"--enable-nss"
|
"--enable-nss"
|
||||||
"--without-rhino"
|
"--without-rhino"
|
||||||
|
@ -1794,25 +1796,26 @@ bootstrapping purposes.")
|
||||||
("procps" ,procps) ;for "free", even though I'm not sure we should use it
|
("procps" ,procps) ;for "free", even though I'm not sure we should use it
|
||||||
("jdk" ,icedtea-6 "jdk")))
|
("jdk" ,icedtea-6 "jdk")))
|
||||||
(inputs
|
(inputs
|
||||||
`(("alsa-lib" ,alsa-lib)
|
(list alsa-lib
|
||||||
("cups" ,cups)
|
cups
|
||||||
("libx11" ,libx11)
|
fontconfig
|
||||||
("libxcomposite" ,libxcomposite)
|
freetype
|
||||||
("libxt" ,libxt)
|
giflib
|
||||||
("libxtst" ,libxtst)
|
gtk+-2
|
||||||
("libxi" ,libxi)
|
lcms
|
||||||
("libxinerama" ,libxinerama)
|
libjpeg-turbo
|
||||||
("libxrender" ,libxrender)
|
libpng
|
||||||
("libjpeg" ,libjpeg-turbo)
|
libx11
|
||||||
("libpng" ,libpng)
|
libxcomposite
|
||||||
("mit-krb5" ,mit-krb5)
|
libxi
|
||||||
("nss" ,nss)
|
libxinerama
|
||||||
("giflib" ,giflib)
|
libxrender
|
||||||
("fontconfig" ,fontconfig)
|
libxt
|
||||||
("freetype" ,freetype)
|
libxtst
|
||||||
("lcms" ,lcms)
|
mit-krb5
|
||||||
("zlib" ,zlib)
|
nss
|
||||||
("gtk" ,gtk+-2)))
|
pcsc-lite
|
||||||
|
zlib))
|
||||||
(home-page "http://icedtea.classpath.org")
|
(home-page "http://icedtea.classpath.org")
|
||||||
(synopsis "Java development kit")
|
(synopsis "Java development kit")
|
||||||
(description
|
(description
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue