summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kbd/default.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-08-04 10:54:22 +0000
committerAlyssa Ross <hi@alyssa.is>2021-08-04 10:54:22 +0000
commitd2e147bedf251976ed99b94b6c905d6761f7a892 (patch)
tree9e0c62d61698916fd4627ed98d3d880c8fc0ab2e /pkgs/os-specific/linux/kbd/default.nix
parent62614cbef7da005c1eda8c9400160f6bcd6546b8 (diff)
parentc464dc811babfe316ed4ab7bbc12351122e69dd7 (diff)
downloadnixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.gz
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.bz2
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.lz
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.xz
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.tar.zst
nixpkgs-d2e147bedf251976ed99b94b6c905d6761f7a892.zip
Merge remote-tracking branch 'nixpkgs/nixos-unstable' into master
Diffstat (limited to 'pkgs/os-specific/linux/kbd/default.nix')
-rw-r--r--pkgs/os-specific/linux/kbd/default.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index c7a59e59cab..23a523b15d7 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     "--disable-nls"
   ];
 
+  patches = [
+    ./search-paths.patch
+  ];
+
   postPatch =
     ''
       # Renaming keymaps with name clashes, because loadkeys just picks
@@ -62,7 +66,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkg-config flex ];
 
   passthru.tests = {
-    inherit (nixosTests) keymap kbd-setfont-decompress;
+    inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
   };
 
   meta = with lib; {