summary refs log tree commit diff
path: root/doc/languages-frameworks
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2018-08-27 19:54:41 -0400
committerGraham Christensen <graham@grahamc.com>2018-08-27 19:54:41 -0400
commit360f420ac7df37e8987473f49e00175ef70732b8 (patch)
tree19e33a0b869bfec1901d81010d5c6bf22d5dff5a /doc/languages-frameworks
parent53371b15c6f287b627e1255bb21d54e123e1f96f (diff)
downloadnixlib-360f420ac7df37e8987473f49e00175ef70732b8.tar
nixlib-360f420ac7df37e8987473f49e00175ef70732b8.tar.gz
nixlib-360f420ac7df37e8987473f49e00175ef70732b8.tar.bz2
nixlib-360f420ac7df37e8987473f49e00175ef70732b8.tar.lz
nixlib-360f420ac7df37e8987473f49e00175ef70732b8.tar.xz
nixlib-360f420ac7df37e8987473f49e00175ef70732b8.tar.zst
nixlib-360f420ac7df37e8987473f49e00175ef70732b8.zip
nixpkgs docs: normalize
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r--doc/languages-frameworks/java.xml24
1 files changed, 11 insertions, 13 deletions
diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml
index 1acea6a7547a..667a795a8d3a 100644
--- a/doc/languages-frameworks/java.xml
+++ b/doc/languages-frameworks/java.xml
@@ -16,18 +16,17 @@ stdenv.mkDerivation {
 }
 </programlisting>
   Note that <varname>jdk</varname> is an alias for the OpenJDK (self-built
-  where available, or pre-built via Zulu).
-  Platforms with OpenJDK not (yet) in Nixpkgs (<literal>Aarch32</literal>,
-  <literal>Aarch64</literal>) point to the (unfree)
-  <literal>oraclejdk</literal>.
-</para>
+  where available, or pre-built via Zulu). Platforms with OpenJDK not (yet) in
+  Nixpkgs (<literal>Aarch32</literal>, <literal>Aarch64</literal>) point to the
+  (unfree) <literal>oraclejdk</literal>.
+ </para>
 
  <para>
   JAR files that are intended to be used by other packages should be installed
-  in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook
-  that add any JARs in the <filename>share/java</filename> directories of the
-  build inputs to the <envar>CLASSPATH</envar> environment variable. For
-  instance, if the package <literal>libfoo</literal> installs a JAR named
+  in <filename>$out/share/java</filename>. JDKs have a stdenv setup hook that
+  add any JARs in the <filename>share/java</filename> directories of the build
+  inputs to the <envar>CLASSPATH</envar> environment variable. For instance, if
+  the package <literal>libfoo</literal> installs a JAR named
   <filename>foo.jar</filename> in its <filename>share/java</filename>
   directory, and another package declares the attribute
 <programlisting>
@@ -61,18 +60,17 @@ installPhase =
   <literal>${jre}/bin/java</literal> instead of
   <literal>${jdk}/bin/java</literal>, you prevent your package from depending
   on the JDK at runtime.
-</para>
+ </para>
 
-<para>
+ <para>
   Note all JDKs passthru <literal>home</literal>, so if your application
   requires environment variables like <envar>JAVA_HOME</envar> being set, that
   can be done in a generic fashion with the <literal>--set</literal> argument
   of <literal>makeWrapper</literal>:
-
 <programlisting>
   --set JAVA_HOME ${jdk.home}
 </programlisting>
-</para>
+ </para>
 
  <para>
   It is possible to use a different Java compiler than <command>javac</command>