lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

libiconv: Don't use stdenv ? cross

authored by

hsloan and committed by
John Ericson
db0af509 5a21bb69

+5 -3
+5 -3
pkgs/development/libraries/libiconv/default.nix
··· 1 - { fetchurl, stdenv, lib }: 1 + { fetchurl, stdenv, lib 2 + , buildPlatform, hostPlatform 3 + }: 2 4 3 - assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross 5 + assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross 4 6 5 7 stdenv.mkDerivation rec { 6 8 name = "libiconv-${version}"; ··· 17 19 ]; 18 20 19 21 postPatch = 20 - lib.optionalString ((stdenv ? cross && stdenv.cross.libc == "msvcrt") || stdenv.cc.nativeLibc) 22 + lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc) 21 23 '' 22 24 sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h 23 25 '';