From db0af50973c11fbd3a402ad703012d4af8c70be9 Mon Sep 17 00:00:00 2001 From: hsloan Date: Wed, 28 Jun 2017 16:14:36 -0400 Subject: [PATCH] libiconv: Don't use stdenv ? cross --- pkgs/development/libraries/libiconv/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 4c634de92468..a056f148683c 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,8 @@ -{ fetchurl, stdenv, lib }: +{ fetchurl, stdenv, lib +, buildPlatform, hostPlatform +}: -assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross +assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross stdenv.mkDerivation rec { name = "libiconv-${version}"; @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { ]; postPatch = - lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc) + lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) '' sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h '';