diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-01-14 16:22:50 -0500 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-01-24 11:37:56 -0500 |
| commit | d27403b17b9e7baa902f90be25391d65c22fe19d (patch) | |
| tree | e96aa8d81386de8635d6c0335fbb4309aaa6771f /pkgs | |
| parent | 94df8e7e4d9024abe9883f310dd6c2c7929f4ce0 (diff) | |
| download | nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.tar nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.tar.gz nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.tar.bz2 nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.tar.lz nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.tar.xz nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.tar.zst nixlib-d27403b17b9e7baa902f90be25391d65c22fe19d.zip | |
libiconv: TEMP force building library improperly for target plat like libc
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bafe502da385..47c565bd2ee7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8241,9 +8241,9 @@ with pkgs; # glibc provides libiconv so systems with glibc don't need to build libiconv # separately, but we also provide libiconvReal, which will always be a # standalone libiconv, just in case you want it - libiconv = if crossSystem != null then - (if crossSystem.libc == "glibc" then libcCross - else if crossSystem.libc == "libSystem" then darwin.libiconv + libiconv = if stdenv ? cross then + (if stdenv.cross.libc == "glibc" then libcCross + else if stdenv.cross.libc == "libSystem" then darwin.libiconv else libiconvReal) else if stdenv.isGlibc then glibcIconv stdenv.cc.libc else if stdenv.isDarwin then darwin.libiconv |