Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glibc: use (lib.getBin pkgsBuildBuild.glibc) to generate locales #262881

Merged
2 commits merged into from Oct 26, 2023
Merged

glibc: use (lib.getBin pkgsBuildBuild.glibc) to generate locales #262881

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7facba7
glibc: use (lib.getBin pkgsBuildBuild.glibc) to generate locales
Oct 23, 2023
7acd36f
glibc: weaken host==build check to canExecute
Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions pkgs/development/libraries/glibc/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
, profilingLibraries ? false
, withGd ? false
, withLibcrypt? false
, buildPackages
, pkgsBuildBuild
, libgcc
}:

Expand Down Expand Up @@ -95,17 +95,26 @@ in
"user-defined-trusted-dirs=${libgcc}/lib"
];

postInstall = previousAttrs.postInstall + (if stdenv.hostPlatform == stdenv.buildPlatform then ''
postInstall = previousAttrs.postInstall + (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then ''
echo SUPPORTED-LOCALES=C.UTF-8/UTF-8 > ../glibc-2*/localedata/SUPPORTED
make -j''${NIX_BUILD_CORES:-1} localedata/install-locales
'' else lib.optionalString stdenv.buildPlatform.isLinux ''
'' else lib.optionalString stdenv.buildPlatform.isLinux
# This is based on http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html
# Instead of using their patch to build a build-native localedef,
# we simply use the one from buildPackages
# we simply use the one from pkgsBuildBuild.
#
# Note that we can't use pkgsBuildHost (aka buildPackages) here, because
# that will cause an eval-time infinite recursion: "buildPackages.glibc
# depended on buildPackages.libgcc, which, since it's GCC, depends on the
# target's bintools, which depend on the target's glibc, which, again,
# depends on buildPackages.glibc, causing an infinute recursion when
# evaluating buildPackages.glibc when glibc hasn't come from stdenv
# (e.g. on musl)." https://github.com/NixOS/nixpkgs/pull/259964
''
pushd ../glibc-2*/localedata
export I18NPATH=$PWD GCONV_PATH=$PWD/../iconvdata
mkdir -p $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale
${lib.getBin buildPackages.glibc}/bin/localedef \
mkdir -p $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale
${lib.getBin pkgsBuildBuild.glibc}/bin/localedef \
--alias-file=../intl/locale.alias \
-i locales/C \
-f charmaps/UTF-8 \
Expand All @@ -115,7 +124,7 @@ in
else
"--big-endian"} \
C.UTF-8
cp -r $NIX_BUILD_TOP/${buildPackages.glibc}/lib/locale $out/lib
cp -r $NIX_BUILD_TOP/${pkgsBuildBuild.glibc}/lib/locale $out/lib
popd
'') + ''

Expand Down