diff options
| author | Adam Joseph <adam@westernsemico.com> | 2022-04-02 18:28:48 -0700 |
|---|---|---|
| committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-04-03 09:11:14 +0200 |
| commit | 7b587ffe610266ae575400c1f6d0f259561c5cf0 (patch) | |
| tree | 9f897c508a11e7e6d421733f93ab52b8ee4b93ba /pkgs | |
| parent | afc3f40b4cd009f63db3410c97b491deba3cce68 (diff) | |
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.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/text/xml/jing-trang/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 02f745575adb9..683eecde46b92 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae84967a74793..03c0673576353 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; |