public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aliases: properly deprecate libintlOrEmpty

Browse Source
This commit is contained in:
Matthew Bauer
2018-03-22 16:50:15 -05:00
parent 7ab562c7d2
commit facd170790
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/aliases.nix
+1
View File
@@ -120,6 +120,7 @@ mapAliases (rec {
libgnome_keyring = libgnome-keyring; # added 2018-02-25 libgnome_keyring = libgnome-keyring; # added 2018-02-25
libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25 libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
libgumbo = gumbo; # added 2018-01-21 libgumbo = gumbo; # added 2018-01-21
libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14
libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
libtidy = html-tidy; # added 2014-12-21 libtidy = html-tidy; # added 2014-12-21
pkgs/top-level/all-packages.nix
-3
View File
@@ -9986,9 +9986,6 @@ with pkgs;
# On non-GNU systems we need GNU Gettext for libintl. # On non-GNU systems we need GNU Gettext for libintl.
libintl = if hostPlatform.libc != "glibc" then gettext else null; libintl = if hostPlatform.libc != "glibc" then gettext else null;
# deprecated: provided for compatability
libintlOrEmpty = [ libintl ];
libid3tag = callPackage ../development/libraries/libid3tag { libid3tag = callPackage ../development/libraries/libid3tag {
gperf = gperf_3_0; gperf = gperf_3_0;
}; };