From 340375f42111310a5401a644d12f987fe0a61252 Mon Sep 17 00:00:00 2001 From: Danny Wilson Date: Sat, 7 Nov 2015 05:03:28 +0100 Subject: [PATCH] Make sure optionalAttrs are set before actually building a derivation. --- pkgs/tools/misc/coreutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 35e9e3828d93..bd0d1b928570 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -11,7 +11,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null; with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; let - self = stdenv.mkDerivation rec { + self = rec { name = "coreutils-8.24"; src = fetchurl { @@ -102,7 +102,7 @@ let }; }; in - self + stdenv.mkDerivation (self // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { FORCE_UNSAFE_CONFIGURE = 1; - } + })