diff options
-rw-r--r-- | pkgs/stdenv/darwin/default.nix | 12 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 9259fc89f7757..45cc6742c7205 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -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) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 615672345693d..2c83089ddf1a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |