Commit
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
vcunat
Member
|
||
'' | ||
sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h | ||
''; | ||
|
Shouldn't this be targetPlatform.libc? I don't think Nix supports Mingw (yet).