b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

kbd: 2.0.4 -> 2.4.0

Browse source
This commit is contained in:
davidak 2021-04-11 02:04:08 +02:00
parent 7cdc46f4e3
commit d83b116910
2 changed files with 6 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,15 +1,14 @@
{ lib, stdenv, fetchurl, autoreconfHook,
gzip, bzip2, pkg-config, flex, check,
pam, coreutils
pkg-config, flex, check, pam, coreutils
}:
stdenv.mkDerivation rec {
pname = "kbd";
version = "2.0.4";
version = "2.4.0";
src = fetchurl {
url = "mirror://kernel/linux/utils/kbd/${pname}-${version}.tar.xz";
sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz";
sha256 = "17wvrqz2kk0w87idinhyvd31ih1dp7ldfl2yfx7ailygb0279w2m";
};
configureFlags = [
@ -18,13 +17,8 @@ stdenv.mkDerivation rec {
"--disable-nls"
];
patches = [ ./search-paths.patch ];
postPatch =
''
# Add Neo keymap subdirectory
sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am
# Renaming keymaps with name clashes, 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
@ -33,21 +27,9 @@ stdenv.mkDerivation rec {
mv qwertz/cz{,-qwertz}.map
mv olpc/es{,-olpc}.map
mv olpc/pt{,-olpc}.map
mv dvorak/{no.map,dvorak-no.map}
mv fgGIod/trf{,-fgGIod}.map
mv colemak/{en-latin9,colemak}.map
popd
# Fix the path to gzip/bzip2.
substituteInPlace src/libkeymap/findfile.c \
--replace gzip ${gzip}/bin/gzip \
--replace bzip2 ${bzip2.bin}/bin/bzip2 \
# We get a warning in armv5tel-linux and the fuloong2f, so we
# disable -Werror in it.
${lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) ''
sed -i s/-Werror// src/Makefile.am
''}
'';
postInstall = ''
@ -57,16 +39,14 @@ stdenv.mkDerivation rec {
done
'';
buildInputs = [ check pam ];
nativeBuildInputs = [ autoreconfHook pkg-config flex ];
makeFlags = [ "setowner=" ];
meta = with lib; {
homepage = "ftp://ftp.altlinux.org/pub/people/legion/kbd/";
description = "Linux keyboard utilities and keyboard maps";
homepage = "https://kbd-project.org/";
description = "Linux keyboard tools and keyboard maps";
platforms = platforms.linux;
license = licenses.gpl2Plus;
maintainers = with maintainers; [ ];
};
}

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

@ -1,71 +0,0 @@
--- a/src/libkeymap/analyze.l
+++ b/src/libkeymap/analyze.l
@@ -101,6 +101,9 @@ stack_pop(struct lk_ctx *ctx, void *scan
static const char *const include_dirpath0[] = { "", 0 };
static const char *const include_dirpath1[] = { "", "../include/", "../../include/", 0 };
static const char *const include_dirpath3[] = {
+ "/etc/kbd/" KEYMAPDIR "/include/",
+ "/etc/kbd/" KEYMAPDIR "/i386/include/",
+ "/etc/kbd/" KEYMAPDIR "/mac/include/",
DATADIR "/" KEYMAPDIR "/include/",
DATADIR "/" KEYMAPDIR "/i386/include/",
DATADIR "/" KEYMAPDIR "/mac/include/", 0
--- a/src/loadkeys.c
+++ b/src/loadkeys.c
@@ -27,7 +27,7 @@
#include "keymap.h"
static const char *progname = NULL;
-static const char *const dirpath1[] = { "", DATADIR "/" KEYMAPDIR "/**", KERNDIR "/", 0 };
+static const char *const dirpath1[] = { "", "/etc/kbd/" KEYMAPDIR "/**", DATADIR "/" KEYMAPDIR "/**", 0 };
static const char *const suffixes[] = { "", ".kmap", ".map", 0 };
static void __attribute__((noreturn))
--- a/src/loadunimap.c
+++ b/src/loadunimap.c
@@ -30,7 +30,7 @@
extern char *progname;
extern int force;
-static const char *const unidirpath[] = { "", DATADIR "/" UNIMAPDIR "/", 0 };
+static const char *const unidirpath[] = { "", "/etc/kbd/" UNIMAPDIR "/", DATADIR "/" UNIMAPDIR "/", 0 };
static const char *const unisuffixes[] = { "", ".uni", ".sfm", 0 };
#ifdef MAIN
--- a/src/mapscrn.c
+++ b/src/mapscrn.c
@@ -27,7 +27,7 @@ void loadnewmap(int fd, char *mfil);
static int ctoi(char *);
/* search for the map file in these directories (with trailing /) */
-static const char *const mapdirpath[] = { "", DATADIR "/" TRANSDIR "/", 0 };
+static const char *const mapdirpath[] = { "", "/etc/kbd/" TRANSDIR "/", DATADIR "/" TRANSDIR "/", 0 };
static const char *const mapsuffixes[] = { "", ".trans", "_to_uni.trans", ".acm", 0 };
#ifdef MAIN
--- a/src/resizecons.c
+++ b/src/resizecons.c
@@ -101,7 +101,7 @@ static int vga_get_fontheight(void);
static void vga_set_cursor(int, int);
static void vga_set_verticaldisplayend_lowbyte(int);
-const char *const dirpath[] = { "", DATADIR "/" VIDEOMODEDIR "/", 0 };
+const char *const dirpath[] = { "", "/etc/kbd/" VIDEOMODEDIR "/", DATADIR "/" VIDEOMODEDIR "/", 0};
const char *const suffixes[] = { "", 0 };
int main(int argc, char **argv)
--- a/src/setfont.c
+++ b/src/setfont.c
@@ -53,10 +53,10 @@ int force = 0;
int debug = 0;
/* search for the font in these directories (with trailing /) */
-const char *const fontdirpath[] = { "", DATADIR "/" FONTDIR "/", 0 };
+const char *const fontdirpath[] = { "", "/etc/kbd/" FONTDIR "/", DATADIR "/" FONTDIR "/", 0 };
const char *const fontsuffixes[] = { "", ".psfu", ".psf", ".cp", ".fnt", 0 };
/* hide partial fonts a bit - loading a single one is a bad idea */
-const char *const partfontdirpath[] = { "", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
+const char *const partfontdirpath[] = { "", "/etc/kbd/" FONTDIR "/" PARTIALDIR "/", DATADIR "/" FONTDIR "/" PARTIALDIR "/", 0 };
const char *const partfontsuffixes[] = { "", 0 };
static inline int