diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2021-09-19 01:10:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-19 01:10:55 +0200 |
| commit | 1cf01b5215032228c9a3c7860adde5ee0e0cc160 (patch) | |
| tree | fcdb73893566bcac2c40c18a53459f2005808197 /nixos/modules/config | |
| parent | ed55c1a44435d36eb4e35da67d0f1faa6e423f04 (diff) | |
| parent | 3026ff17ec700429967dda62401c788dba4e90da (diff) | |
| download | nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.tar nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.tar.gz nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.tar.bz2 nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.tar.lz nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.tar.xz nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.tar.zst nixpkgs-1cf01b5215032228c9a3c7860adde5ee0e0cc160.zip | |
Merge pull request #138207 from rnhmjoj/layouts
nixos/extra-layouts: avoid all rebuilds
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/console.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/config/console.nix b/nixos/modules/config/console.nix index c5150305bd8..98f942ee63f 100644 --- a/nixos/modules/config/console.nix +++ b/nixos/modules/config/console.nix @@ -116,7 +116,11 @@ in { console.keyMap = with config.services.xserver; mkIf cfg.useXkbConfig (pkgs.runCommand "xkb-console-keymap" { preferLocalBuild = true; } '' - '${pkgs.ckbcomp}/bin/ckbcomp' -model '${xkbModel}' -layout '${layout}' \ + '${pkgs.ckbcomp}/bin/ckbcomp' \ + ${optionalString (config.environment.sessionVariables ? XKB_CONFIG_ROOT) + "-I${config.environment.sessionVariables.XKB_CONFIG_ROOT}" + } \ + -model '${xkbModel}' -layout '${layout}' \ -option '${xkbOptions}' -variant '${xkbVariant}' > "$out" ''); } |