summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2022-03-15 20:06:20 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-03-15 21:21:17 +0000
commite2d0740dfc49c08c77e03d6e21630bdbfab089de (patch)
treed944991430cc61c79806debb3dfea61e411eb1ed
parentdisnixos: 0.9.2 -> 0.9.3 (diff)
downloadnixpkgs-e2d0740dfc49c08c77e03d6e21630bdbfab089de.tar.gz
DisnixWebService: compile with OpenJDK8 to retain compatibility with Tomcat 9.x
(cherry picked from commit 4206a9bbbafa5bf8af82ae89d58c097e32ee79b5)
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d0e305f2caf..076eb22f5b86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32764,7 +32764,9 @@ with pkgs;
disnixos = callPackage ../tools/package-management/disnix/disnixos { };
- DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService { };
+ DisnixWebService = callPackage ../tools/package-management/disnix/DisnixWebService {
+ jdk = jdk8;
+ };
lkproof = callPackage ../tools/typesetting/tex/lkproof { };