cosmic-settings,cosmic-greeter: add env variables for xkb-data paths (#…

…332)
lilyinstarlight · Sep 14, 2024 · ea50ed0 · ea50ed0
1 parent 5683913
commit ea50ed0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pkgs/cosmic-greeter/package.nix b/pkgs/cosmic-greeter/package.nix
@@ -10,6 +10,7 @@
 , stdenv
 , udev
 , nix-update-script
+, xkeyboard_config
 }:
 
 rustPlatform.buildRustPackage {
@@ -67,6 +68,11 @@ rustPlatform.buildRustPackage {
     substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}'
   '';
 
+  postInstall = ''
+    libcosmicAppWrapperArgs+=(--set X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml)
+    libcosmicAppWrapperArgs+=(--set X11_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.extras.xml)
+  '';
+
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--version-regex" "epoch-(.*)" ];
   };

diff --git a/pkgs/cosmic-settings/package.nix b/pkgs/cosmic-settings/package.nix
@@ -16,6 +16,7 @@
 , udev
 , util-linux
 , nix-update-script
+, xkeyboard_config
 }:
 
 let
@@ -76,6 +77,8 @@ rustPlatform.buildRustPackage {
 
   postInstall = ''
     libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ cosmic-randr ]})
+    libcosmicAppWrapperArgs+=(--set X11_BASE_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.xml)
+    libcosmicAppWrapperArgs+=(--set X11_EXTRA_RULES_XML ${xkeyboard_config}/share/X11/xkb/rules/base.extras.xml)
   '';
 
   passthru.updateScript = nix-update-script {