b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libiconv: don't use libiconvReal on NetBSD

Browse source 
It's perhaps debatable whether we want to be building iconv as part of
libc on BSD, I suppose, but while that's the current situation there's
no point pulling in libiconvReal as well.
This commit is contained in:
Alyssa Ross 2023-01-15 17:14:08 +00:00
parent 498ee90602
commit bf9643c2b7
No known key found for this signature in database
GPG key ID: F9DBED4859B271C0
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/top-level/all-packages.nix
View file

@ -21110,9 +21110,10 @@ with pkgs;
libgsf = callPackage ../development/libraries/libgsf { };
# GNU libc provides libiconv so systems with glibc don't need to build
# libiconv separately. Additionally, Apple forked/repackaged libiconv so we
# use that instead of the vanilla version on that OS.
# GNU libc provides libiconv so systems with glibc don't need to
# build libiconv separately. Additionally, Apple forked/repackaged
# libiconv so we use that instead of the vanilla version on that OS,
# and BSDs include libiconv in libc.
#
# We also provide `libiconvReal`, which will always be a standalone libiconv,
# just in case you want it regardless of platform.
@ -21123,6 +21124,8 @@ with pkgs;
else stdenv.cc.libc)
else if stdenv.hostPlatform.isDarwin
then darwin.libiconv
else if stdenv.hostPlatform.isNetBSD
then null
else libiconvReal;
glibcIconv = libc: let