diff options
| author | hsloan <ishaqsloan@gmail.com> | 2017-06-28 16:14:36 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 19:34:32 -0400 |
| commit | db0af50973c11fbd3a402ad703012d4af8c70be9 (patch) | |
| tree | 89ca70b9089a5bb975c6476dce3894a0be3bf7ba | |
| parent | 5a21bb6917abc75f294b49b7902bc9b5545aad82 (diff) | |
| download | nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.tar nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.tar.gz nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.tar.bz2 nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.tar.lz nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.tar.xz nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.tar.zst nixpkgs-db0af50973c11fbd3a402ad703012d4af8c70be9.zip | |
libiconv: Don't use stdenv ? cross
| -rw-r--r-- | pkgs/development/libraries/libiconv/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 4c634de9246..a056f148683 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 ''; |