diff options
author | William A. Kennington III <william@wkennington.com> | 2015-04-01 18:36:31 -0700 |
---|---|---|
committer | William A. Kennington III <william@wkennington.com> | 2015-04-01 18:36:31 -0700 |
commit | 04e39bdb5cc52de47c741c555ec301370abfc113 (patch) | |
tree | 37622ec37e351b15f82ef266361652c0117c9684 /pkgs/os-specific/linux/kbd | |
parent | 1db981a05035854442c56da547d5ac09af676bcf (diff) | |
download | nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.tar nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.tar.gz nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.tar.bz2 nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.tar.lz nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.tar.xz nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.tar.zst nixpkgs-04e39bdb5cc52de47c741c555ec301370abfc113.zip |
kbd: 1.15.3 -> 2.0.2
Diffstat (limited to 'pkgs/os-specific/linux/kbd')
-rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index d2413be6f5a..e7b9753c6b7 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, gzip, bzip2 }: +{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, check, pam }: stdenv.mkDerivation rec { - name = "kbd-1.15.3"; + name = "kbd-2.0.2"; src = fetchurl { url = "ftp://ftp.altlinux.org/pub/people/legion/kbd/${name}.tar.gz"; - sha256 = "1vcl2791xshjdpi4w88iy87gkb7zv0dbvi83f98v30dvqc9mfl46"; + sha256 = "08f0nc78h6l2z39lr5jddpq7lvm365sc42597nvd6f8hc2bcgr5i"; }; /* Get the dvorak programmer keymap (present in X but not in kbd) */ @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { sha256 = "1wlgp09wq84hml60hi4ls6d4zna7vhycyg40iipyh1279i91hsx7"; }; - configureFlags = "--disable-nls"; - - preConfigure = '' - sh autogen.sh - ''; + configureFlags = [ + "--enable-optional-progs" + "--enable-libkeymap" + "--disable-nls" + ]; patchPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map # Fix the path to gzip/bzip2. - substituteInPlace src/findfile.c \ + substituteInPlace src/libkeymap/findfile.c \ --replace gzip ${gzip}/bin/gzip \ --replace bzip2 ${bzip2}/bin/bzip2 \ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ autoconf automake libtool ]; + buildInputs = [ autoreconfHook pkgconfig check pam ]; makeFlags = "setowner= "; |