From 69eeb830394ab3059a66f876dd9ff92caa356bbd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Jul 2013 16:02:52 +0200
Subject: [PATCH] Use "or"

---
 modules/services/networking/firewall.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/modules/services/networking/firewall.nix b/modules/services/networking/firewall.nix
index c47210c7cefb..40fbbabed3f0 100644
--- a/modules/services/networking/firewall.nix
+++ b/modules/services/networking/firewall.nix
@@ -40,13 +40,9 @@ let
     '';
 
   kernelPackages = config.boot.kernelPackages;
-  kernelHasRPFilter = kernelPackages.kernel ? features
-                   && kernelPackages.kernel.features ? netfilterRPFilter
-                   && kernelPackages.kernel.features.netfilterRPFilter;
 
-  kernelCanDisableHelpers = kernelPackages.kernel ? features
-                   && kernelPackages.kernel.features ? canDisableNetfilterConntrackHelpers
-                   && kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers;
+  kernelHasRPFilter = kernelPackages.kernel.features.netfilterRPFilter or false;
+  kernelCanDisableHelpers = kernelPackages.kernel.features.canDisableNetfilterConntrackHelpers or false;
 
 in