diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-14 14:13:42 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-03-22 16:50:09 -0500 |
commit | 223a77c311610b92f25dccd5d621498ed4a39213 (patch) | |
tree | cce51195fc3d9926ef36b636511ab03fce51989b | |
parent | e5ab8585e4cbd8b66e5033c09d7d00eb16582a2f (diff) | |
download | nixlib-223a77c311610b92f25dccd5d621498ed4a39213.tar nixlib-223a77c311610b92f25dccd5d621498ed4a39213.tar.gz nixlib-223a77c311610b92f25dccd5d621498ed4a39213.tar.bz2 nixlib-223a77c311610b92f25dccd5d621498ed4a39213.tar.lz nixlib-223a77c311610b92f25dccd5d621498ed4a39213.tar.xz nixlib-223a77c311610b92f25dccd5d621498ed4a39213.tar.zst nixlib-223a77c311610b92f25dccd5d621498ed4a39213.zip |
libiconvOrNull: deprecate
-rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa20bbaf47de..e3ad45d15f80 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9990,7 +9990,10 @@ with pkgs; }; # On non-GNU systems we need GNU Gettext for libintl. - libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; + libintl = if hostPlatform.libc != "glibc" then gettext else null; + + # deprecated: provided for compatability + libintlOrEmpty = [ libintl ]; libid3tag = callPackage ../development/libraries/libid3tag { gperf = gperf_3_0; |