diff options
| author | Randy Eckenrode <randy@largeandhighquality.com> | 2024-03-31 11:32:02 -0400 |
|---|---|---|
| committer | Randy Eckenrode <randy@largeandhighquality.com> | 2024-04-27 18:09:53 -0400 |
| commit | c88b49062a8beda372c0a3ab35667881f828bdb9 (patch) | |
| tree | cf0558aa7dd7f7be5c34adfe861fb2dc87366cff /pkgs/stdenv | |
| parent | 89c9b73ce7e1e542e21c78a0918d22b80c961fa4 (diff) | |
libiconv: use libiconv-darwin
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/darwin/default.nix | 12 |
1 files changed, 6 insertions, 6 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) |