hardening: use lib.toList

2018-03-06 00:30:08 -05:00
parent 9fe17b2153
commit 9783a677f3
1 changed files with 2 additions and 6 deletions
@@ -119,13 +119,9 @@ rec {
        "fortify" "stackprotector" "pic" "strictoverflow" "format" "relro" "bindnow"
      ];

-      hardeningDisable =
-        let val  = attrs.hardeningDisable or [ ];
-        in if builtins.isList val then val else [ val ];
+      hardeningDisable = lib.toList (attrs.hardeningDisable or [ ]);

-      hardeningEnable =
-        let val = attrs.hardeningEnable or [ ];
-        in if builtins.isList val then val else [ val ];
+      hardeningEnable = lib.toList (attrs.hardeningEnable or [ ]);

      enabledHardeningOptions =
        if builtins.elem "all" hardeningDisable