diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 14:10:49 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-11-29 14:10:49 +0100 |
commit | 72684fb42fc2a5da68746098eb85fcc4935e9b3d (patch) | |
tree | eabf0c6bcd4356e8f670412fd140d0ef619b0437 /pkgs/development/libraries/libiconv/default.nix | |
parent | 4b48d05c58bb97c016c05f4014ac3c32f7f2d548 (diff) |
Remove support for the obsolete powerpc-darwin and i686-darwin platforms
Diffstat (limited to 'pkgs/development/libraries/libiconv/default.nix')
-rw-r--r-- | pkgs/development/libraries/libiconv/default.nix | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index f2958e4668de8..bffc72e005cbf 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { name = "libiconv-1.13.1"; src = fetchurl { @@ -8,6 +8,12 @@ stdenv.mkDerivation (rec { sha256 = "0jcsjk2g28bq20yh7rvbn8xgq6q42g8dkkac0nfh12b061l638sm"; }; + # 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" ]; + meta = { description = "GNU libiconv, an iconv(3) implementation"; @@ -27,16 +33,6 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.ludo ]; # This library is not needed on GNU platforms. - platforms = [ "i686-cygwin" "i686-darwin" ]; + platforms = [ "i686-cygwin" ]; }; } - -// - -stdenv.lib.optionalAttrs stdenv.isCygwin { - # 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 = [ "--enable-static" ]; -}) |