public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure optionalAttrs are set before actually building a derivation.

Browse Source
This commit is contained in:
Danny Wilson 2015-11-07 05:03:28 +01:00
parent f9134ca9df
commit 340375f421
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/misc/coreutils/default.nix
View File

@ -11,7 +11,7 @@ assert selinuxSupport -> libselinux != null && libsepol != null;
with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; }; with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; };
let let
self = stdenv.mkDerivation rec { self = rec {
name = "coreutils-8.24"; name = "coreutils-8.24";
src = fetchurl { src = fetchurl {
@ -102,7 +102,7 @@ let
}; };
}; };
in in
self stdenv.mkDerivation (self
// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) { // stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) {
FORCE_UNSAFE_CONFIGURE = 1; FORCE_UNSAFE_CONFIGURE = 1;
} })