diff options
author | Marko Durkovic <marko@miding.de> | 2014-10-23 12:03:01 +0200 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2015-05-28 10:53:34 +0200 |
commit | b658196c6c00f02878e8e5c4c55c8cc871314e83 (patch) | |
tree | 6f8b5fcdd038fbd5bcabd683ab55e3a6d371fb91 /pkgs/development/libraries/libiconv/default.nix | |
parent | ebf6d98fc2518b6687f367d38ce76d05d9b2171a (diff) |
cygwin: libiconv and gettext for x86_64
Diffstat (limited to 'pkgs/development/libraries/libiconv/default.nix')
-rw-r--r-- | pkgs/development/libraries/libiconv/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 9e65e63ffdb8c..70b0574a7b46a 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -10,11 +10,16 @@ stdenv.mkDerivation rec { sha256 = "04q6lgl3kglmmhw59igq1n7v3rp1rpkypl366cy1k1yn2znlvckj"; }; + patches = if stdenv.isCygwin then [ + ./libiconv-1.14-reloc.patch + ./libiconv-1.14-wchar.patch + ] else null; + # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL # (Windows' linker would need to be used somehow to produce an actual # DLL.) Thus, build the static library too, and this is what Gettext # will actually use. - configureFlags = stdenv.lib.optional stdenv.isCygwin [ "--enable-static" ]; + configureFlags = if stdenv.isCygwin then [ "--enable-static" ] else null; crossAttrs = { # Disable stripping to avoid "libiconv.a: Archive has no index" (MinGW). |