glibcLocales: remove builder

There's no particular reason to have a special builder. Fold all the
changes it made into the derivation.
This commit is contained in:
Maximilian Bosch
2025-10-05 13:14:36 +02:00
parent bbe152dcfe
commit cfb771c8a5
2 changed files with 17 additions and 20 deletions
@@ -1,15 +0,0 @@
# Glibc cannot have itself in its RPATH.
export NIX_NO_SELF_RPATH=1
postConfigure() {
# Hack: get rid of the `-static' flag set by the bootstrap stdenv.
# This has to be done *after* `configure' because it builds some
# test binaries.
export NIX_CFLAGS_LINK=
export NIX_LDFLAGS_BEFORE=
export NIX_DONT_SET_RPATH=1
unset CFLAGS
}
genericBuild
+17 -5
View File
@@ -31,13 +31,25 @@
(
finalAttrs: previousAttrs: {
builder = ./locales-builder.sh;
outputs = [ "out" ];
LOCALEDEF_FLAGS = [
(if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian")
];
env = (previousAttrs.env or { }) // {
LOCALEDEF_FLAGS = if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian";
# Glibc cannot have itself in its RPATH.
NIX_NO_SELF_RPATH = 1;
};
postConfigure = (previousAttrs.postConfigure or "") + ''
# Hack: get rid of the `-static' flag set by the bootstrap stdenv.
# This has to be done *after* `configure' because it builds some
# test binaries.
export NIX_CFLAGS_LINK=
export NIX_LDFLAGS_BEFORE=
export NIX_DONT_SET_RPATH=1
unset CFLAGS
'';
preBuild =
(previousAttrs.preBuild or "")