Snippet #2391 (python)

  • #2391
Expires in: 0 minutes View Raw
  1. commit f60118c5c8ea8a6527d5f8fc7bbe6adc99126e4e
  2. Author: Nadrieril <nadrieril@gmail.com>
  3. Date:   Sun Jul 8 13:14:36 2018 +0100
  4.  
  5.    nixos/xserver: use xkbDir setting when validating/converting configuration
  6.  
  7. diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
  8. index 6bf8c653e11..8ec910ce93a 100644
  9. --- a/nixos/modules/config/i18n.nix
  10. +++ b/nixos/modules/config/i18n.nix
  11. @@ -120,7 +120,7 @@ with lib;
  12.       mkIf config.i18n.consoleUseXkbConfig
  13.         (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } ''
  14.           '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \
  15. -            -option '${xkbOptions}' -variant '${xkbVariant}' > "$out"
  16. +            -option '${xkbOptions}' -variant '${xkbVariant}' -I '${xkbDir}' > "$out"
  17.         '');
  19.     environment.systemPackages =
  20. diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
  21. index 0237dd6f560..0e62c888052 100644
  22. --- a/nixos/modules/services/x11/xserver.nix
  23. +++ b/nixos/modules/services/x11/xserver.nix
  24. @@ -687,10 +687,10 @@ in
  25.     services.xserver.xkbDir = mkDefault "${pkgs.xkeyboard_config}/etc/X11/xkb";
  27.     system.extraDependencies = singleton (pkgs.runCommand "xkb-validated" {
  28. -      inherit (cfg) xkbModel layout xkbVariant xkbOptions;
  29. +      inherit (cfg) xkbModel layout xkbVariant xkbOptions xkbDir;
  30.       nativeBuildInputs = [ pkgs.xkbvalidate ];
  31.     } ''
  32. -      validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions"
  33. +      validate "$xkbModel" "$layout" "$xkbVariant" "$xkbOptions" "$xkbDir"
  34.       touch "$out"
  35.     '');
  37. diff --git a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
  38. index d9c9042467c..2c0b218a0e8 100644
  39. --- a/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
  40. +++ b/pkgs/tools/X11/xkbvalidate/xkbvalidate.c
  41. @@ -96,13 +96,14 @@ int main(int argc, char **argv)
  42.     struct xkb_context *ctx;
  43.     struct xkb_rule_names *rdef;
  45. -    if (argc != 5) {
  46. -        fprintf(stderr, "Usage: %s model layout variant options\n", argv[0]);
  47. +    if (argc != 6) {
  48. +        fprintf(stderr, "Usage: %s model layout variant options dir\n", argv[0]);
  49.         return EXIT_FAILURE;
  50.     }
  52. -    ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES);
  53. +    ctx = xkb_context_new(XKB_CONTEXT_NO_ENVIRONMENT_NAMES || XKB_CONTEXT_NO_DEFAULT_INCLUDES);
  54.     xkb_context_set_log_fn(ctx, add_log);
  55. +    xkb_context_include_path_append(ctx, argv[5]);
  57.     rdef = malloc(sizeof(struct xkb_rule_names));

Reply to this snippet →

Honeypot, don't fill.
⌘+⏎ or Ctrl+⏎