From 9783a677f36e9fda024073a3bfb2f09eeb1030d8 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 8 Aug 2017 07:13:21 -0400 Subject: [PATCH] hardening: use lib.toList --- pkgs/stdenv/generic/make-derivation.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 56977747246..be98dee01ab 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -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