summary refs log tree commit diff
path: root/nixos/modules/services/misc
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-02-10 09:54:12 +0000
committerGitHub <noreply@github.com>2018-02-10 09:54:12 +0000
commit7914e6be3e819217632382dc053888ffb09e27fc (patch)
treecc1dea47a2945c2ffbe6e5ab1b71b3943954bf69 /nixos/modules/services/misc
parent7fd8e8b40ecb1b8f9c347e41769666846a43ae33 (diff)
parent77218de812171b20cab961de0eaa784bf2d98699 (diff)
downloadnixlib-7914e6be3e819217632382dc053888ffb09e27fc.tar
nixlib-7914e6be3e819217632382dc053888ffb09e27fc.tar.gz
nixlib-7914e6be3e819217632382dc053888ffb09e27fc.tar.bz2
nixlib-7914e6be3e819217632382dc053888ffb09e27fc.tar.lz
nixlib-7914e6be3e819217632382dc053888ffb09e27fc.tar.xz
nixlib-7914e6be3e819217632382dc053888ffb09e27fc.tar.zst
nixlib-7914e6be3e819217632382dc053888ffb09e27fc.zip
Merge pull request #34655 from markus1189/zookeeper-package-option
zookeeper.service: option for package and add to environment
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r--nixos/modules/services/misc/zookeeper.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix
index d85b5e4ec507..91539592511c 100644
--- a/nixos/modules/services/misc/zookeeper.nix
+++ b/nixos/modules/services/misc/zookeeper.nix
@@ -106,10 +106,19 @@ in {
       '';
     };
 
+    package = mkOption {
+      description = "The zookeeper package to use";
+      default = pkgs.zookeeper;
+      defaultText = "pkgs.zookeeper";
+      type = types.package;
+    };
+
   };
 
 
   config = mkIf cfg.enable {
+    environment.systemPackages = [cfg.package];
+
     systemd.services.zookeeper = {
       description = "Zookeeper Daemon";
       wantedBy = [ "multi-user.target" ];
@@ -118,7 +127,7 @@ in {
       serviceConfig = {
         ExecStart = ''
           ${pkgs.jre}/bin/java \
-            -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \
+            -cp "${cfg.package}/lib/*:${cfg.package}/${cfg.package.name}.jar:${configDir}" \
             ${escapeShellArgs cfg.extraCmdLineOptions} \
             -Dzookeeper.datadir.autocreate=false \
             ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \