diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-09-21 21:59:20 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-09-21 21:59:20 +0100 |
| commit | 6800e5c15135e37e366a071ebb1fa8c1c24689c8 (patch) | |
| tree | fb67f8d929fb9f5f6fbe42ef755a6a4ad71c9172 /pkgs/os-specific/linux/kbd | |
| parent | e12483116b3b51a185a33a272bf351e357ba9a99 (diff) | |
| download | nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.tar nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.tar.gz nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.tar.bz2 nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.tar.lz nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.tar.xz nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.tar.zst nixpkgs-6800e5c15135e37e366a071ebb1fa8c1c24689c8.zip | |
kbd: 2.6.2 -> 2.6.3
Changes: https://github.com/legionus/kbd/releases/tag/v2.6.3
Diffstat (limited to 'pkgs/os-specific/linux/kbd')
| -rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kbd/search-paths.patch | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 1c38f4b7f49..9d97f73780d 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "kbd"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz"; - sha256 = "sha256-M+O7PD9VkzsQ8FOxS19pouJMKFQ+nsdpAkb+R2KN2U8="; + sha256 = "sha256-BJlsCNfRxGCWb7JEo9OIM1LCZ0t61SIAPZ9Oy4q0jes="; }; # vlock is moved into its own output, since it depends on pam. This diff --git a/pkgs/os-specific/linux/kbd/search-paths.patch b/pkgs/os-specific/linux/kbd/search-paths.patch index fad33be45bd..61e8918017c 100644 --- a/pkgs/os-specific/linux/kbd/search-paths.patch +++ b/pkgs/os-specific/linux/kbd/search-paths.patch @@ -18,34 +18,30 @@ Without this patch, kbd will only look inside DATADIR "/" KEYMAPDIR "/mac/include/", --- a/src/libkfont/context.c +++ b/src/libkfont/context.c -@@ -13,6 +13,7 @@ +@@ -13,5 +13,6 @@ /* search for the map file in these directories (with trailing /) */ static const char *const mapdirpath[] = { - "", + "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", NULL }; -@@ -28,6 +29,7 @@ static const char *const mapsuffixes[] = { +@@ -28,5 +29,6 @@ static const char *const mapsuffixes[] = { /* search for the font in these directories (with trailing /) */ static const char *const fontdirpath[] = { - "", + "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", NULL }; -@@ -42,6 +44,7 @@ static char const *const fontsuffixes[] = { +@@ -42,5 +44,6 @@ static char const *const fontsuffixes[] = { static const char *const unidirpath[] = { - "", + "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", NULL }; -@@ -55,6 +58,7 @@ static const char *const unisuffixes[] = { +@@ -55,5 +58,6 @@ static const char *const unisuffixes[] = { /* hide partial fonts a bit - loading a single one is a bad idea */ const char *const partfontdirpath[] = { - "", + "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", NULL |