Fix tomcat package reference
This commit is contained in:
parent
d152e50d65
commit
256583e295
|
@ -28,7 +28,8 @@ in
|
||||||
|
|
||||||
simpleAppservingTomcat = import ./apache-tomcat/simple-appserving-tomcat.nix {
|
simpleAppservingTomcat = import ./apache-tomcat/simple-appserving-tomcat.nix {
|
||||||
inherit stateDir;
|
inherit stateDir;
|
||||||
inherit (pkgs) lib tomcat;
|
inherit (pkgs) lib;
|
||||||
|
tomcat = pkgs.tomcat9;
|
||||||
tomcatConstructorFun = constructors.simpleAppservingTomcat;
|
tomcatConstructorFun = constructors.simpleAppservingTomcat;
|
||||||
dysnomia = pkgs.dysnomia.override (origArgs: {
|
dysnomia = pkgs.dysnomia.override (origArgs: {
|
||||||
enableTomcatWebApplication = true;
|
enableTomcatWebApplication = true;
|
||||||
|
@ -37,7 +38,8 @@ in
|
||||||
|
|
||||||
disnixAppservingTomcat = import ./apache-tomcat/disnix-appserving-tomcat.nix {
|
disnixAppservingTomcat = import ./apache-tomcat/disnix-appserving-tomcat.nix {
|
||||||
inherit stateDir;
|
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;
|
tomcatConstructorFun = constructors.simpleAppservingTomcat;
|
||||||
dysnomia = pkgs.dysnomia.override (origArgs: {
|
dysnomia = pkgs.dysnomia.override (origArgs: {
|
||||||
enableTomcatWebApplication = true;
|
enableTomcatWebApplication = true;
|
||||||
|
|
Loading…
Reference in New Issue