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

darwin.stdenv: avoid an infinite recursion

Browse Source 
libiconv-darwin depends on Meson, which (indirectly) depends on
libiconv. When libiconv-darwin is set as libiconv, it will cause an
infinite recursion. Avoid the infinite recursion by using libiconvReal
in stage 1. Every stage after that can use libiconv-darwin.
This commit is contained in:
Randy Eckenrode 2024-03-31 11:29:04 -04:00
parent 3157d72860
commit ad38102a67
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
1 changed files with 4 additions and 1 deletions

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

@ -428,6 +428,9 @@ in
# Disable tests because they use dejagnu, which fails to run. # Disable tests because they use dejagnu, which fails to run.
libffi = super.libffi.override { doCheck = false; }; libffi = super.libffi.override { doCheck = false; };
# Use libconvReal to break an infinite recursion. It will be dropped in the next stage.
libiconv = super.libiconvReal;
# Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
libxml2 = super.libxml2.override { pythonSupport = false; }; libxml2 = super.libxml2.override { pythonSupport = false; };
@ -539,7 +542,7 @@ in
inherit (prevStage) ccWrapperStdenv inherit (prevStage) ccWrapperStdenv
autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu
libedit libffi libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4
ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config
python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz
zlib zstd; zlib zstd;