diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2021-12-17 22:23:22 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2021-12-23 20:27:46 +0100 |
| commit | dba1124beab36c3419488eb153c72ad08fdb475d (patch) | |
| tree | 4e81db253529787d575648347958503f7962ed48 | |
| parent | 5c27e1f8a045cd28ad814e6df85a04b73120bcff (diff) | |
| download | guix-dba1124beab36c3419488eb153c72ad08fdb475d.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/java.scm | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 46892ce3be..654689be45 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -85,6 +85,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages popt) #:use-module (gnu packages kerberos) + #:use-module (gnu packages security-token) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages texinfo) @@ -1330,9 +1331,10 @@ bootstrapping purposes.") (srfi srfi-26)) #:configure-flags - ;; TODO: package pcsc and sctp, and add to inputs - `("--disable-system-pcsc" - "--disable-system-sctp" + ;; TODO: package sctp and add to inputs + `("--disable-system-sctp" + "--enable-system-pcsc" + "--enable-system-lcms" "--enable-bootstrap" "--enable-nss" "--without-rhino" @@ -1794,25 +1796,26 @@ bootstrapping purposes.") ("procps" ,procps) ;for "free", even though I'm not sure we should use it ("jdk" ,icedtea-6 "jdk"))) (inputs - `(("alsa-lib" ,alsa-lib) - ("cups" ,cups) - ("libx11" ,libx11) - ("libxcomposite" ,libxcomposite) - ("libxt" ,libxt) - ("libxtst" ,libxtst) - ("libxi" ,libxi) - ("libxinerama" ,libxinerama) - ("libxrender" ,libxrender) - ("libjpeg" ,libjpeg-turbo) - ("libpng" ,libpng) - ("mit-krb5" ,mit-krb5) - ("nss" ,nss) - ("giflib" ,giflib) - ("fontconfig" ,fontconfig) - ("freetype" ,freetype) - ("lcms" ,lcms) - ("zlib" ,zlib) - ("gtk" ,gtk+-2))) + (list alsa-lib + cups + fontconfig + freetype + giflib + gtk+-2 + lcms + libjpeg-turbo + libpng + libx11 + libxcomposite + libxi + libxinerama + libxrender + libxt + libxtst + mit-krb5 + nss + pcsc-lite + zlib)) (home-page "http://icedtea.classpath.org") (synopsis "Java development kit") (description |