summary refs log tree commit diff
path: root/pkgs/build-support
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2015-04-03 16:03:49 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2015-04-03 16:03:49 +0300
commit8592c6c004a9cc549ba4031ced474442c0ea3284 (patch)
treec0875dfc5a342a395ce52e54de422da9256d79a4 /pkgs/build-support
parentbdc1ab3db6eb43fa7a4959b2668ab717fd135286 (diff)
parentba93a75724b9671208d7e48789bc9d71a9da648b (diff)
downloadnixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.tar
nixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.tar.gz
nixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.tar.bz2
nixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.tar.lz
nixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.tar.xz
nixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.tar.zst
nixlib-8592c6c004a9cc549ba4031ced474442c0ea3284.zip
Merge pull request #7150 from joachifm/grsec-types
grsecurity module: use types.enum
Diffstat (limited to 'pkgs/build-support')
-rw-r--r--pkgs/build-support/grsecurity/default.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 7bafd78d76a3..e82792be033a 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -50,14 +50,14 @@ let
         "GRKERNSEC_CONFIG_SERVER y";
 
     grsecVirtCfg =
-      if cfg.config.virtualisationConfig == "none" then
+      if cfg.config.virtualisationConfig == null then
         "GRKERNSEC_CONFIG_VIRT_NONE y"
       else if cfg.config.virtualisationConfig == "host" then
         "GRKERNSEC_CONFIG_VIRT_HOST y"
       else
         "GRKERNSEC_CONFIG_VIRT_GUEST y";
 
-    grsecHwvirtCfg = if cfg.config.virtualisationConfig == "none" then "" else
+    grsecHwvirtCfg = if cfg.config.virtualisationConfig == null then "" else
       if cfg.config.hardwareVirtualisation == true then
         "GRKERNSEC_CONFIG_VIRT_EPT y"
       else
@@ -66,7 +66,7 @@ let
     grsecVirtswCfg =
       let virtCfg = opt: "GRKERNSEC_CONFIG_VIRT_"+opt+" y";
       in
-        if cfg.config.virtualisationConfig == "none" then ""
+        if cfg.config.virtualisationConfig == null then ""
         else if cfg.config.virtualisationSoftware == "xen"    then virtCfg "XEN"
         else if cfg.config.virtualisationSoftware == "kvm"    then virtCfg "KVM"
         else if cfg.config.virtualisationSoftware == "vmware" then virtCfg "VMWARE"