summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-03-04 10:25:54 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-03-04 15:59:41 +0100
commit0e309f1e5bc78dfc1366f40e4071b2fd0979178f (patch)
tree0b579c2082b31f36fec9d0587621ecc9b7ddcbfb /gnu
parent1289062522e3d08259740e59243c6cd0642a9916 (diff)
downloadpatches-0e309f1e5bc78dfc1366f40e4071b2fd0979178f.tar
patches-0e309f1e5bc78dfc1366f40e4071b2fd0979178f.tar.gz
gnu: icedtea6: split outputs.
* gnu/packages/java.scm (icedtea6)[outputs]: Use separate outputs for documentation ("doc"), JDK ("jdk"), and JRE ("out"). * gnu/packages/java.scm (ant)[native-inputs]: Reference "jdk" output of icedtea6 package. * gnu/packages/statistics.scm (r)[inputs]: Reference "jdk" output of icedtea6 package.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/java.scm14
-rw-r--r--gnu/packages/statistics.scm2
2 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c486742c14..0d332933a0 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -90,7 +90,7 @@
'configure
(alist-delete 'install %standard-phases))))))
(native-inputs
- `(("icedtea6" ,icedtea6)))
+ `(("icedtea6" ,icedtea6 "jdk")))
(home-page "http://ant.apache.org")
(synopsis "Build tool for Java")
(description
@@ -122,6 +122,9 @@ build process and its dependencies, whereas Make uses Makefile format.")
(("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
"DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
(build-system gnu-build-system)
+ (outputs '("out" ; Java Runtime Environment
+ "jdk" ; Java Development Kit
+ "doc")) ; all documentation
(arguments
`(;; There are many failing tests and many are known to fail upstream.
;;
@@ -412,8 +415,13 @@ build process and its dependencies, whereas Make uses Makefile format.")
(run-test "check-jdk")))))
(alist-replace
'install
- (lambda _
- (copy-recursively "openjdk.build" %output))
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((doc (string-append (assoc-ref outputs "doc") "/share/doc/" ,name))
+ (jre (assoc-ref outputs "out"))
+ (jdk (assoc-ref outputs "jdk")))
+ (copy-recursively "openjdk.build/docs" doc)
+ (copy-recursively "openjdk.build/j2re-image" jre)
+ (copy-recursively "openjdk.build/j2sdk-image" jdk)))
%standard-phases))))))))
(native-inputs
`(("ant-bootstrap"
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index acf7b7851d..ad7bc589fe 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -87,7 +87,7 @@
("cairo" ,cairo)
("gfortran" ,gfortran-4.8)
("icu4c" ,icu4c)
- ("icedtea6" ,icedtea6)
+ ("icedtea6" ,icedtea6 "jdk")
("lapack" ,lapack)
("libjpeg" ,libjpeg)
("libpng" ,libpng)