From 51856df2a1b465eb93d5966f2013f64a916d5a65 Mon Sep 17 00:00:00 2001 From: hsloan Date: Wed, 28 Jun 2017 16:23:34 -0400 Subject: [PATCH] nlohmann_json: Don't use stdenv.cross --- pkgs/development/libraries/nlohmann_json/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index a5a808c1f615..9fb614cd071a 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, cmake +, hostPlatform +}: stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { crossAttrs = { cmakeFlags = "-DBuildTests=OFF"; doCheck = false; - } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") { + } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") { cmakeFlags = "-DBuildTests=OFF -DCMAKE_SYSTEM_NAME=Windows"; };