From 256583e295d632b72cbf9f2608d6f1e0159abce2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 13 Mar 2021 16:13:19 +0100
Subject: [PATCH] Fix tomcat package reference

---
 service-containers-agnostic/constructors.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/service-containers-agnostic/constructors.nix b/service-containers-agnostic/constructors.nix
index 33170e2..05de0d3 100644
--- a/service-containers-agnostic/constructors.nix
+++ b/service-containers-agnostic/constructors.nix
@@ -28,7 +28,8 @@ in
 
   simpleAppservingTomcat = import ./apache-tomcat/simple-appserving-tomcat.nix {
     inherit stateDir;
-    inherit (pkgs) lib tomcat;
+    inherit (pkgs) lib;
+    tomcat = pkgs.tomcat9;
     tomcatConstructorFun = constructors.simpleAppservingTomcat;
     dysnomia = pkgs.dysnomia.override (origArgs: {
       enableTomcatWebApplication = true;
@@ -37,7 +38,8 @@ in
 
   disnixAppservingTomcat = import ./apache-tomcat/disnix-appserving-tomcat.nix {
     inherit stateDir;
-    inherit (pkgs) lib tomcat libmatthew_java dbus_java DisnixWebService;
+    inherit (pkgs) lib libmatthew_java dbus_java DisnixWebService;
+    tomcat = pkgs.tomcat9;
     tomcatConstructorFun = constructors.simpleAppservingTomcat;
     dysnomia = pkgs.dysnomia.override (origArgs: {
       enableTomcatWebApplication = true;