summary refs log tree commit diff
path: root/pkgs/tools/misc/calamares/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/misc/calamares/default.nix')
-rw-r--r--pkgs/tools/misc/calamares/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index e23471fc96d..a73a2821cbf 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -33,6 +33,9 @@ mkDerivation rec {
     ./uimod.patch
     # Remove options for unsupported partition types
     ./partitions.patch
+    # Fix setting the kayboard layout on GNOME wayland
+    # By default the module uses the setxkbmap, which will not change the keyboard
+    ./waylandkbd.patch
   ];
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
@@ -57,7 +60,7 @@ mkDerivation rec {
     sed -e "s,pkexec calamares,calamares," \
         -i calamares.desktop
 
-    sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=io.calamares.calamares," \
+    sed -e "s,X-AppStream-Ignore=true,&\nStartupWMClass=calamares," \
         -i calamares.desktop
 
     # Fix desktop reference with wayland