Merge pull request #138955 from Infinisil/glibc-locales-duplicates

glibcLocales: Fix build for duplicates in locales list
This commit is contained in:
Silvan Mosberger
2021-09-23 13:02:48 +02:00
committed by GitHub
+2 -2
View File
@@ -34,9 +34,9 @@ callPackage ./common.nix { inherit stdenv; } {
+ lib.optionalString (!allLocales) ''
# Check that all locales to be built are supported
echo -n '${lib.concatMapStrings (s: s + " \\\n") locales}' \
| sort > locales-to-build.txt
| sort -u > locales-to-build.txt
cat ../glibc-2*/localedata/SUPPORTED | grep ' \\' \
| sort > locales-supported.txt
| sort -u > locales-supported.txt
comm -13 locales-supported.txt locales-to-build.txt \
> locales-unsupported.txt
if [[ $(wc -c locales-unsupported.txt) != "0 locales-unsupported.txt" ]]; then