cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #210980 from alyssais/libiconv-netbsd

Browse source 
libiconv: don't use libiconvReal on NetBSD
This commit is contained in:
John Ericson 2023-01-18 20:18:35 -05:00 committed by GitHub
commit 5340466804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -21086,9 +21086,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.
@ -21099,6 +21100,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