diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:06:19 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-26 18:21:18 +0000 |
commit | 7ac6743433dd45ceaead2ca96f6356dc0d064ce6 (patch) | |
tree | b68ec89d7d2a8d2b6e6b1ff94ba26d6af4096350 /nixpkgs/pkgs/os-specific/linux/kbd/default.nix | |
parent | c5c7451dbef37b51f52792d6395a670ef5183d27 (diff) | |
parent | 891f607d5301d6730cb1f9dcf3618bcb1ab7f10e (diff) | |
download | nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.gz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.bz2 nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.lz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.xz nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.tar.zst nixlib-7ac6743433dd45ceaead2ca96f6356dc0d064ce6.zip |
Merge commit '891f607d5301d6730cb1f9dcf3618bcb1ab7f10e'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/kbd/default.nix')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/kbd/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/kbd/default.nix b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix index 7ee449ff33ed..2119c10b9cf0 100644 --- a/nixpkgs/pkgs/os-specific/linux/kbd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/kbd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, autoreconfHook, - gzip, bzip2, pkgconfig, flex, check, +{ lib, stdenv, fetchurl, autoreconfHook, + gzip, bzip2, pkg-config, flex, check, pam, coreutils }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # We get a warning in armv5tel-linux and the fuloong2f, so we # disable -Werror in it. - ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' + ${lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) '' sed -i s/-Werror// src/Makefile.am ''} ''; @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { buildInputs = [ check pam ]; - nativeBuildInputs = [ autoreconfHook pkgconfig flex ]; + nativeBuildInputs = [ autoreconfHook pkg-config flex ]; makeFlags = [ "setowner=" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "ftp://ftp.altlinux.org/pub/people/legion/kbd/"; description = "Linux keyboard utilities and keyboard maps"; platforms = platforms.linux; |