dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

libiconv: use libiconv-darwin

Browse Source
This commit is contained in:
Randy Eckenrode 2024-03-31 11:32:02 -04:00
parent 89c9b73ce7
commit c88b49062a
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/stdenv/darwin/default.nix
View File

@ -873,7 +873,7 @@ in
llvmPackages = super.llvmPackages // (
let
tools = super.llvmPackages.tools.extend (_: _: {
inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang libllvm llvm;
inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm;
clang = prevStage.stdenv.cc;
});
@ -972,7 +972,7 @@ in
sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd
# CF dependencies - don’t rebuild them.
icu libiconv libxml2 zlib;
icu libiconv libiconv-darwin libxml2 zlib;
# Disable tests because they use dejagnu, which fails to run.
libffi = super.libffi.override { doCheck = false; };
@ -1057,7 +1057,7 @@ in
icu
# LLVM dependencies - don’t rebuild them.
libffi libiconv libxml2 ncurses zlib;
libffi libiconv libiconv-darwin libxml2 ncurses zlib;
darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
inherit (prevStage.darwin) dyld CF Libsystem darwin-stubs
@ -1328,9 +1328,9 @@ in
overrides = self: super: {
inherit (prevStage)
bash binutils brotli bzip2 coreutils cpio diffutils ed file findutils gawk
gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libssh2
libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch pbzx
pcre python3Minimal xar xz zlib zstd;
gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libiconv-darwin
libidn2 libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam
openssl patch pbzx pcre python3Minimal xar xz zlib zstd;
darwin = super.darwin.overrideScope (_: superDarwin: {
inherit (prevStage.darwin)

6
pkgs/top-level/all-packages.nix
View File

@ -22607,7 +22607,7 @@ with pkgs;
# 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,
# libiconv, so build and use the upstream one with a compatible ABI,
# and BSDs include libiconv in libc.
#
# We also provide `libiconvReal`, which will always be a standalone libiconv,
@ -22618,7 +22618,7 @@ with pkgs;
then libcCross
else stdenv.cc.libc)
else if stdenv.hostPlatform.isDarwin
then darwin.libiconv
then libiconv-darwin
else libiconvReal;
libcIconv = libc: let
@ -22635,7 +22635,7 @@ with pkgs;
if lib.elem stdenv.hostPlatform.libc [ "glibc" "musl" ] then
lib.getBin stdenv.cc.libc
else if stdenv.hostPlatform.isDarwin then
lib.getBin darwin.libiconv
lib.getBin libiconv
else
lib.getBin libiconvReal;