From 424e6e501a44dc38c610f6d2039dda1cfafe9490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 4 Oct 2015 14:31:16 +0200 Subject: [PATCH] nixos/modules: simplify pkgs.zfs handling Thanks, @lethalman. --- nixos/modules/virtualisation/docker.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index 0e1b9206999..7288cf29875 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -129,8 +129,7 @@ in LimitNPROC = 1048576; } // proxy_env; - path = [ pkgs.kmod ] ++ - (if cfg.storageDriver == "zfs" then [ pkgs.zfs ] else []); + path = [ pkgs.kmod ] ++ (optional (cfg.storageDriver == "zfs") pkgs.zfs); environment.MODULE_DIR = "/run/current-system/kernel-modules/lib/modules"; postStart = cfg.postStart;