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

libiconv: Don't use stdenv ? cross

Browse Source
This commit is contained in:
hsloan 2017-06-28 16:14:36 -04:00 committed by John Ericson
parent 5a21bb6917
commit db0af50973
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libiconv/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "libiconv-${version}"; name = "libiconv-${version}";
@ -17,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
postPatch = 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 sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
''; '';