b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

jing-trang: use jdk_headless instead of jdk

Browse source 
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:
Adam Joseph 2022-04-02 18:28:48 -07:00 committed by Bjørn Forsman
parent afc3f40b4c
commit 7b587ffe61
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/text/xml/jing-trang/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }:
{ lib, stdenv, fetchFromGitHub, jre_headless, jdk_headless, ant, saxon }:
stdenv.mkDerivation rec {
pname = "jing-trang";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
buildInputs = [ jdk ant saxon ];
buildInputs = [ jdk_headless ant saxon ];
CLASSPATH = "lib/saxon.jar";

2
pkgs/top-level/all-packages.nix
View file

@ -6965,7 +6965,7 @@ with pkgs;
jing = res.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 { };