mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

kbd: 2.6.2 -> 2.6.3

Browse source 
Changes: https://github.com/legionus/kbd/releases/tag/v2.6.3
This commit is contained in:
Sergei Trofimovich 2023-09-21 21:59:20 +01:00
parent e12483116b
commit 6800e5c151
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/os-specific/linux/kbd/default.nix
View file

@ -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

12
pkgs/os-specific/linux/kbd/search-paths.patch
View file

@ -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