diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-22 14:15:32 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-07-22 14:15:32 +0200 |
| commit | db6c38a075fbac96fabcc7759aa6e6ddd5526b0c (patch) | |
| tree | 77e9e366af73273bcec75e089999824a39f08496 /doc | |
| parent | 16dec3974696dd2a83865f017402ac9fdfb8cf8a (diff) | |
| parent | 62cb4f72282b228a9072452448b0574170bebc06 (diff) | |
| download | nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.gz nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.bz2 nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.lz nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.xz nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.tar.zst nixlib-db6c38a075fbac96fabcc7759aa6e6ddd5526b0c.zip | |
Merge master into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/java.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml index 287f63e685c4..68a1a097984d 100644 --- a/doc/languages-frameworks/java.xml +++ b/doc/languages-frameworks/java.xml @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "..."; src = fetchurl { ... }; - buildInputs = [ jdk ant ]; + nativeBuildInputs = [ jdk ant ]; buildPhase = "ant"; } @@ -30,7 +30,8 @@ stdenv.mkDerivation { <filename>foo.jar</filename> in its <filename>share/java</filename> directory, and another package declares the attribute <programlisting> -buildInputs = [ jdk libfoo ]; +buildInputs = [ libfoo ]; +nativeBuildInputs = [ jdk ]; </programlisting> then <envar>CLASSPATH</envar> will be set to <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>. @@ -46,7 +47,7 @@ buildInputs = [ jdk libfoo ]; script to run it using the OpenJRE. You can use <literal>makeWrapper</literal> for this: <programlisting> -buildInputs = [ makeWrapper ]; +nativeBuildInputs = [ makeWrapper ]; installPhase = '' @@ -76,7 +77,7 @@ installPhase = It is possible to use a different Java compiler than <command>javac</command> from the OpenJDK. For instance, to use the GNU Java Compiler: <programlisting> -buildInputs = [ gcj ant ]; +nativeBuildInputs = [ gcj ant ]; </programlisting> Here, Ant will automatically use <command>gij</command> (the GNU Java Runtime) instead of the OpenJRE. |