Skip to content

libiconv: Correct cross-building #15021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bnikolic wants to merge 4 commits into from
Closed

libiconv: Correct cross-building #15021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d845b2
libiconv: Correct cross-building
bnikolic Apr 27, 2016
6c2b0fa
libiconv: Fix failure for darwin crossDrv
bnikolic Apr 27, 2016
328ce9f
libiconv: Fix cross-compilation with linux target
bnikolic Apr 27, 2016
c515c02
libiconv: Only add crossDrv if crossSystem is defined
bnikolic Apr 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion pkgs/development/libraries/libiconv/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{ fetchurl, stdenv, lib }:

assert (!stdenv.isLinux);

stdenv.mkDerivation rec {
name = "libiconv-1.14";
Expand Down
15 changes: 8 additions & 7 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7722,13 +7722,14 @@ in
# 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
else libiconvReal)
else if stdenv.isGlibc then stdenv.cc.libc
else if stdenv.isDarwin then darwin.libiconv
else libiconvReal;
libiconv = (if stdenv.isGlibc then stdenv.cc.libc
else if stdenv.isDarwin then darwin.libiconv
else libiconvReal ) //
stdenv.lib.optionalAttrs (crossSystem != null)
{
crossDrv = (if crossSystem.libc == "glibc" then libcCross
else libiconvReal.crossDrv);
};

libiconvReal = callPackage ../development/libraries/libiconv {
fetchurl = fetchurlBoot;
Expand Down