diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-07-30 01:21:44 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-07-30 01:21:44 +0300 |
| commit | 373a623daa80b3f1e18a084db4a6ebb206a0046d (patch) | |
| tree | 53e9131664c43fab73305f9d23eb3ec50dc4bae8 /pkgs/os-specific/linux/kbd/default.nix | |
| parent | cdb18068cde28d53b0ce64e2a8f32b1a20b8717f (diff) | |
| download | nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.tar nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.tar.gz nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.tar.bz2 nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.tar.lz nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.tar.xz nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.tar.zst nixpkgs-373a623daa80b3f1e18a084db4a6ebb206a0046d.zip | |
Revert "Revert "kbd: 2.0.3 -> 2.0.4""
This reverts commit 00bf3a9dcaffedc4eaf244848a2a3f84e648bdba.
Diffstat (limited to 'pkgs/os-specific/linux/kbd/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/kbd/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 6e8893cc37d..31fcdae6c80 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -1,12 +1,15 @@ -{ stdenv, fetchurl, autoreconfHook, gzip, bzip2, pkgconfig, flex, check, pam }: +{ stdenv, fetchurl, autoreconfHook, + gzip, bzip2, pkgconfig, flex, check, + pam, coreutils +}: stdenv.mkDerivation rec { name = "kbd-${version}"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://kernel/linux/utils/kbd/${name}.tar.xz"; - sha256 = "0ppv953gn2zylcagr4z6zg5y2x93dxrml29plypg6xgbq3hrv2bs"; + sha256 = "124swm93dm4ca0pifgkrand3r9gvj3019d4zkfxsj9djpvv0mnaz"; }; configureFlags = [ @@ -15,7 +18,7 @@ stdenv.mkDerivation rec { "--disable-nls" ]; - patches = [ ./console-fix.patch ./search-paths.patch ]; + patches = [ ./search-paths.patch ]; postPatch = '' @@ -34,6 +37,12 @@ stdenv.mkDerivation rec { ''} ''; + postInstall = '' + substituteInPlace $out/bin/unicode_{start,stop} \ + --replace /usr/bin/tty ${coreutils}/bin/tty + ''; + + buildInputs = [ check pam ]; nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; |