diff options
| author | Cosima Neidahl <opna2608@protonmail.com> | 2024-06-07 19:49:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-07 19:49:31 +0200 |
| commit | 5b3b5d79aad1183a6ba800d5e3e0496cad22ddb6 (patch) | |
| tree | f46d47f89b452c2969050abe878642afeddc31bd /pkgs/desktops | |
| parent | 443f72c74e3b4d6cc843fd2a2c5fd0fba30d4f5a (diff) | |
| parent | 2735184f6d8fdb7f32265fd4a3a92bce29ee52a7 (diff) | |
Merge pull request #316275 from OPNA2608/fix/lomiri-xkb-layout
lomiri.lomiri: Try to consider services.xserver.xkb.layout
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch | 29 | ||||
| -rw-r--r-- | pkgs/desktops/lomiri/applications/lomiri/default.nix | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch b/pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch new file mode 100644 index 0000000000000..0563aab5dda85 --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri/9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch @@ -0,0 +1,29 @@ +From 640cab41986fac83742af39dd19877041a2ab8dc Mon Sep 17 00:00:00 2001 +From: OPNA2608 <opna2608@protonmail.com> +Date: Sat, 1 Jun 2024 00:22:27 +0200 +Subject: [PATCH] Check NIXOS_XKB_LAYOUTS for layouts before falling back to + "us" + +--- + plugins/AccountsService/AccountsService.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/plugins/AccountsService/AccountsService.cpp b/plugins/AccountsService/AccountsService.cpp +index bcf18246c..f4a7dfaa1 100644 +--- a/plugins/AccountsService/AccountsService.cpp ++++ b/plugins/AccountsService/AccountsService.cpp +@@ -295,6 +295,11 @@ QStringList AccountsService::keymaps() const + return simplifiedMaps; + } + ++ char* fallbackNixosLayouts = getenv("NIXOS_XKB_LAYOUTS"); ++ if (fallbackNixosLayouts != NULL && fallbackNixosLayouts[0] != '\0') { ++ return QString(fallbackNixosLayouts).split(QLatin1Char(','), Qt::SkipEmptyParts); ++ } ++ + return {QStringLiteral("us")}; + } + +-- +2.42.0 + diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix index 35fdd1e466178..ca46560e702a5 100644 --- a/pkgs/desktops/lomiri/applications/lomiri/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix @@ -117,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { }) ./9901-lomiri-Disable-Wizard.patch + ./9902-lomiri-Check-NIXOS_XKB_LAYOUTS.patch ]; postPatch = '' |