diff options
| author | Peter Simons <simons@cryp.to> | 2014-05-07 22:13:26 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-05-07 23:11:51 +0200 |
| commit | 8c75363c719f1ac161a295f240dedf339863f092 (patch) | |
| tree | b6a08786b96fe0b7e375d009b6393b84dd352b20 | |
| parent | 3b873648b3aae5f2364bbd7f865ec4f8af40076c (diff) | |
| download | nixlib-8c75363c719f1ac161a295f240dedf339863f092.tar nixlib-8c75363c719f1ac161a295f240dedf339863f092.tar.gz nixlib-8c75363c719f1ac161a295f240dedf339863f092.tar.bz2 nixlib-8c75363c719f1ac161a295f240dedf339863f092.tar.lz nixlib-8c75363c719f1ac161a295f240dedf339863f092.tar.xz nixlib-8c75363c719f1ac161a295f240dedf339863f092.tar.zst nixlib-8c75363c719f1ac161a295f240dedf339863f092.zip | |
The logic behind 'libiconvOrLibc' is flawed and that attribute should be removed.
See https://github.com/NixOS/nixpkgs/pull/2532 for further details.
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd39b080d4c5..f81dc83491b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5085,6 +5085,9 @@ let then null else libiconv; + # The logic behind this attribute is broken: libiconvOrNull==null does + # NOT imply libiconv=glibc! On Darwin, for example, we have a native + # libiconv library which is not glibc. libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv; # On non-GNU systems we need GNU Gettext for libintl. |