From 14c35537fcac826c475418686e7b523ab1543617 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Apr 2025 23:01:04 +0800 Subject: [PATCH 1/2] budgie-desktop: Explicitly set overlay-key to Super_L Mutter 48 defaults to 'Super' for overlay-key, which is not supported in magpie (note that we don't build magpie with with_shared_components). As a result the budgie menu is not popping up with the "Windows" key. The upstream author also experienced crashes like "The mapping function given to g_settings_get_mapped() for key 'overlay-key' in schema 'org.gnome.mutter' returned FALSE when given a NULL value" though I cannot reproduce that yet. --- pkgs/by-name/bu/budgie-desktop/package.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix index 6126ba0dd6e0..e39b5293e4c7 100644 --- a/pkgs/by-name/bu/budgie-desktop/package.nix +++ b/pkgs/by-name/bu/budgie-desktop/package.nix @@ -77,6 +77,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch"; hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws="; }) + + # Add override for overlay-key to prevent crash with mutter-common v48-rc + # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683 + (fetchpatch { + url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch"; + hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0="; + }) ]; nativeBuildInputs = [ From fb0fe514bf774f953a12ba4902ab1bd7c752b64b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 25 Apr 2025 23:03:34 +0800 Subject: [PATCH 2/2] budgie-gsettings-overrides: Remove duplicated edge-tiling override This is already overridden in 20_solus-project.budgie.wm.gschema.override, which will be copied here. --- pkgs/by-name/bu/budgie-gsettings-overrides/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix index 02bd605ee3cf..ca3def9789ff 100644 --- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix +++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix @@ -35,9 +35,6 @@ let [org.gnome.desktop.wm.preferences:Budgie] titlebar-font="Noto Sans Bold 10" - [org.gnome.mutter:Budgie] - edge-tiling=true - [com.solus-project.budgie-menu:Budgie] use-default-menu-icon=true