diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index b7dd81c03785..39d14b569f2f 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,14 +1,22 @@ -{stdenv, fetchurl, bison, flex}: +{ stdenv, fetchurl, bison, flex, autoconf, automake }: stdenv.mkDerivation rec { - name = "kbd-1.15"; + name = "kbd-1.15.1"; src = fetchurl { url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; - sha256 = "1h2klv4sxf0j08fzlpki2zf7f4k7m0j1d0ca01a1bsd8yza0l39d"; + sha256 = "1klrxas8vjikx6jm6m2lcpmn88lhxb6p3whwgdwq9d9flf1qrf4i"; }; - buildInputs = [bison flex]; + buildInputs = [ bison flex autoconf automake ]; + + # Grrr, kbd 1.15.1 doesn't include a configure script. + preConfigure = "autoreconf"; makeFlags = "setowner= "; + + meta = { + homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; + description = "Linux keyboard utilities and keyboard maps"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9fcdf299be71..18202421daf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5531,7 +5531,7 @@ let }; kbd = import ../os-specific/linux/kbd { - inherit fetchurl stdenv bison flex; + inherit fetchurl stdenv bison flex autoconf automake; }; kernelHeaders = kernelHeaders_2_6_28;