From 8cd6d53930dcde2e4bfe79f449916de6847daa6c Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 9 Mar 2015 02:14:19 +0100 Subject: [PATCH] kbd: Patch in support for the Neo keyboard layout. This adds support for the Neo keyboard layout (http://neo-layout.org/, a layout optimized for the German language) for the native Linux console. It also adds build dependencies on autotools and friends, because we need to recreate the automake config in order to include a new keyboard layout directory. Signed-off-by: aszlig --- pkgs/os-specific/linux/kbd/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 2355fec1b529..673ad5d31650 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gzip, bzip2 }: +{ stdenv, fetchurl, autoconf, automake, libtool, gzip, bzip2 }: stdenv.mkDerivation rec { name = "kbd-1.15.3"; @@ -14,10 +14,24 @@ stdenv.mkDerivation rec { sha256 = "0e859211cfe16a18a3b9cbf2ca3e280a23a79b4e40b60d8d01d0fde7336b6d50"; }; + neoSrc = fetchurl { + name = "neo.map"; + url = "https://svn.neo-layout.org/linux/console/neo.map?r=2455"; + sha256 = "1wlgp09wq84hml60hi4ls6d4zna7vhycyg40iipyh1279i91hsx7"; + }; + configureFlags = "--disable-nls"; + preConfigure = '' + sh autogen.sh + ''; + patchPhase = '' + mkdir -p data/keymaps/i386/neo + cat "$neoSrc" > data/keymaps/i386/neo/neo.map + sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in + # Add the dvp keyboard in the dvorak folder ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map @@ -33,6 +47,8 @@ stdenv.mkDerivation rec { ''} ''; + buildInputs = [ autoconf automake libtool ]; + makeFlags = "setowner= "; meta = {