From 31c1161b085f151234812086269881b0adeb7257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 24 Nov 2023 00:24:09 -0300 Subject: [PATCH 1/4] budgie.magpie: Don't install shared components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/magpie/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/desktops/budgie/magpie/default.nix b/pkgs/desktops/budgie/magpie/default.nix index 22ebec3353ef..827948d24401 100644 --- a/pkgs/desktops/budgie/magpie/default.nix +++ b/pkgs/desktops/budgie/magpie/default.nix @@ -70,7 +70,6 @@ stdenv.mkDerivation (finalAttrs: { "-Degl_device=true" "-Dprofiler=true" "-Ddocs=true" - "-Dwith_shared_components=true" ]; propagatedBuildInputs = [ From 198e57d2dfc4a56afc419f465c5a56c729f71e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Fri, 24 Nov 2023 00:24:28 -0300 Subject: [PATCH 2/4] budgie.budgie-gsettings-overrides: Replace Magpie with Mutter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Magpie no longer provides the "org.gnome.mutter" settings schema. Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix index e402f7045727..bd9e1b6024ef 100644 --- a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix +++ b/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix @@ -4,7 +4,7 @@ , budgie-desktop-view , glib , gsettings-desktop-schemas -, magpie +, gnome , mate , nixos-artwork , nixos-background-light ? nixos-artwork.wallpapers.nineish @@ -63,7 +63,7 @@ let budgie-desktop budgie-desktop-view gsettings-desktop-schemas - magpie + gnome.mutter ] ++ extraGSettingsOverridePackages; in From 47523ccec2742bb9dbbd05d0eae714107f882967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 25 Nov 2023 19:36:00 -0300 Subject: [PATCH 3/4] budgie.budgie-control-center: Replace Magpie with Mutter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Magpie no longer provides the "org.gnome.mutter" settings schema. Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-control-center/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/budgie/budgie-control-center/default.nix b/pkgs/desktops/budgie/budgie-control-center/default.nix index 7c11fe7933e5..1a51c3dfc1f1 100644 --- a/pkgs/desktops/budgie/budgie-control-center/default.nix +++ b/pkgs/desktops/budgie/budgie-control-center/default.nix @@ -39,7 +39,6 @@ , libwacom , libxml2 , libxslt -, magpie , meson , modemmanager , networkmanager @@ -109,6 +108,7 @@ stdenv.mkDerivation rec { gnome.gnome-remote-desktop gnome.gnome-settings-daemon gnome.gnome-user-share + gnome.mutter gsettings-desktop-schemas gsound gtk3 @@ -126,7 +126,6 @@ stdenv.mkDerivation rec { libsecret libwacom libxml2 - magpie modemmanager networkmanager polkit @@ -159,7 +158,7 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share" --prefix XDG_DATA_DIRS : "${librsvg}/share" # WM keyboard shortcuts - --prefix XDG_DATA_DIRS : "${magpie}/share" + --prefix XDG_DATA_DIRS : "${gnome.mutter}/share" ) ''; From bf68ef906b422ed198fdb077c10c88d4128fef9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Federico=20Dami=C3=A1n=20Schonborn?= Date: Sat, 25 Nov 2023 19:36:41 -0300 Subject: [PATCH 4/4] budgie.budgie-desktop: Add dependency on Mutter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Magpie no longer provides the "org.gnome.mutter" settings schema. Signed-off-by: Federico Damián Schonborn --- pkgs/desktops/budgie/budgie-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/budgie/budgie-desktop/default.nix b/pkgs/desktops/budgie/budgie-desktop/default.nix index 8c07bcab6ab3..04263c99a74f 100644 --- a/pkgs/desktops/budgie/budgie-desktop/default.nix +++ b/pkgs/desktops/budgie/budgie-desktop/default.nix @@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { gnome-menus gnome.gnome-bluetooth_1_0 gnome.gnome-settings-daemon + gnome.mutter gnome.zenity graphene gtk3