jing-trang: use jdk_headless instead of jdk
This allows to build the nixpkgs manual from a "headless" machine, i.e. without dragging in an entire linux desktop.
This commit is contained in:
parent
afc3f40b4c
commit
7b587ffe61
|
@ -1,4 +1,4 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
|
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk_headless, ant, saxon }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "jing-trang";
|
pname = "jing-trang";
|
||||||
|
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ jdk ant saxon ];
|
buildInputs = [ jdk_headless ant saxon ];
|
||||||
|
|
||||||
CLASSPATH = "lib/saxon.jar";
|
CLASSPATH = "lib/saxon.jar";
|
||||||
|
|
||||||
|
|
|
@ -6965,7 +6965,7 @@ with pkgs;
|
||||||
|
|
||||||
jing = res.jing-trang;
|
jing = res.jing-trang;
|
||||||
jing-trang = callPackage ../tools/text/xml/jing-trang {
|
jing-trang = callPackage ../tools/text/xml/jing-trang {
|
||||||
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
|
||||||
};
|
};
|
||||||
|
|
||||||
jira-cli = callPackage ../development/tools/jira_cli { };
|
jira-cli = callPackage ../development/tools/jira_cli { };
|
||||||
|
|
Loading…
Reference in a new issue