From 47b47b539d4d467b70861a42e0d9abba20f1362a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 4 Mar 2015 10:25:54 +0100 Subject: [PATCH 1/3] 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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c486742..962d710 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -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" -- 2.1.0