From 223a77c311610b92f25dccd5d621498ed4a39213 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 14 Mar 2018 14:13:42 -0500 Subject: [PATCH] libiconvOrNull: deprecate --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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;