Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

kbd: Rename some keymaps.

From upstream kbd, some keymap names are reused across very different
keyboard layouts. This is a a problem because loadkeys just picks the
first keymap it sees. The clashing names lead to e.g. "loadkeys no"
defaulting to a norwegian dvorak map instead of the much more common
qwerty one.

Used Arch Linux's list of keymaps that need renaming, with a small
deviation: the norwegian dvorak map becomes dvorak-no instead of
no-dvorak, to match the naming scheme for all the other dvorak maps.

fixes #47878

authored by

Erlend Pedersen and committed by
Jörg Thalheim
f1987fb5 c2e6ca50

+13
+13
pkgs/os-specific/linux/kbd/default.nix
··· 25 25 # Add Neo keymap subdirectory 26 26 sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am 27 27 28 + # Renaming keymaps with name clashes, because loadkeys just picks 29 + # the first keymap it sees. The clashing names lead to e.g. 30 + # "loadkeys no" defaulting to a norwegian dvorak map instead of 31 + # the much more common qwerty one. 32 + pushd data/keymaps/i386 33 + mv qwertz/cz{,-qwertz}.map 34 + mv olpc/es{,-olpc}.map 35 + mv olpc/pt{,-olpc}.map 36 + mv dvorak/{no.map,dvorak-no.map} 37 + mv fgGIod/trf{,-fgGIod}.map 38 + mv colemak/{en-latin9,colemak}.map 39 + popd 40 + 28 41 # Fix the path to gzip/bzip2. 29 42 substituteInPlace src/libkeymap/findfile.c \ 30 43 --replace gzip ${gzip}/bin/gzip \