BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

grub2: workaround parallel build failure by building .po files sequentially

Browse source 
Without the change `grub2` build occasionally fails as:

    https://hydra.nixos.org/log/h04imslmgy9l33z6xxsaf9v4svqsc3n2-grub-2.12-rc1.drv

    $ msgmerge --update  --lang=de de.po grub.pot
    $ msgmerge --update  --lang=de de.po grub.pot
    ...
    de.po:745: end-of-file within string
    de.po:745: missing 'msgstr' section

Here `msgmerge --update` attempts to update `de.po` from two parallel
`make` calls when translation updates are happening.

The change works around `de.po` stomping bu regenerating translations
sequentially.

Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com>
This commit is contained in:
Sergei Trofimovich 2023-08-13 10:44:04 +01:00
parent ead1dc9913
commit eafc041a19
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/misc/grub/default.nix
View file

@ -149,6 +149,13 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts' substituteInPlace ./configure --replace '/usr/share/fonts/unifont' '${unifont}/share/fonts'
''; '';
postConfigure = ''
# make sure .po files are up to date to workaround
# parallel `msgmerge --update` on autogenerated .po files:
# https://github.com/NixOS/nixpkgs/pull/248747#issuecomment-1676301670
make dist
'';
configureFlags = [ configureFlags = [
"--enable-grub-mount" # dep of os-prober "--enable-grub-mount" # dep of os-prober
] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [