Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jing-trang: use jdk_headless instead of jdk #166985

Merged
merged 1 commit into from Apr 3, 2022
Merged

jing-trang: use jdk_headless instead of jdk #166985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/tools/text/xml/jing-trang/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};

buildInputs = [ jdk ant saxon ];
buildInputs = [ jdk_headless ant saxon ];

CLASSPATH = "lib/saxon.jar";

Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down