gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pantheon updates 2025-11-15 (#461908)

Browse Source
This commit is contained in:
Bobby Rong
2025-11-15 16:00:48 +00:00
committed by GitHub
parent 56b5cf59ee ff28035782
commit 6bfdf5c332
12 changed files with 105 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/desktop-managers/pantheon.nix
View File

@@ -226,7 +226,6 @@ in
gnome-menus
adwaita-icon-theme
gtk3.out # for gtk-launch program
onboard
sound-theme-freedesktop
xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
])

8
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix
View File

@@ -20,7 +20,6 @@
libgnomekbd,
libxklavier,
ibus,
onboard,
switchboard,
}:
@@ -40,8 +39,13 @@ stdenv.mkDerivation rec {
# https://github.com/elementary/settings-keyboard/issues/324
./hide-install-unlisted-engines-button.patch
# We no longer ship Pantheon X11 session in NixOS.
# https://github.com/elementary/session-settings/issues/91
# https://github.com/elementary/session-settings/issues/82
./hide-onscreen-keyboard-settings.patch
(replaceVars ./fix-paths.patch {
inherit onboard libgnomekbd;
inherit libgnomekbd;
})
];

13
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/fix-paths.patch
View File

@@ -1,16 +1,3 @@
diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala
index bd461685..b6371096 100644
--- a/src/Behavior/Behavior.vala
+++ b/src/Behavior/Behavior.vala
@@ -252,7 +252,7 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
onscreen_keyboard_settings.clicked.connect (() => {
try {
- var appinfo = GLib.AppInfo.create_from_commandline ("onboard-settings", null, NONE);
+ var appinfo = GLib.AppInfo.create_from_commandline ("@onboard@/bin/onboard-settings", null, NONE);
appinfo.launch (null, null);
} catch (Error e) {
critical ("Unable to launch onboard-settings: %s", e.message);
diff --git a/src/Layout/Widgets/AddLayoutDialog.vala b/src/Layout/Widgets/AddLayoutDialog.vala
index 25cc0fe9..b3e350bb 100644
--- a/src/Layout/Widgets/AddLayoutDialog.vala

12
pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/hide-onscreen-keyboard-settings.patch Normal file
View File

@@ -0,0 +1,12 @@
diff --git a/src/Behavior/Behavior.vala b/src/Behavior/Behavior.vala
index a1929fe4..2f332694 100644
--- a/src/Behavior/Behavior.vala
+++ b/src/Behavior/Behavior.vala
@@ -227,7 +227,6 @@ public class Keyboard.Behaviour.Page : Gtk.Box {
blink_grid.attach (scale_blink_time, 1, 2);
var box = new Gtk.Box (VERTICAL, 18);
- box.append (onscreen_keyboard_grid);
box.append (blink_grid);
box.append (repeat_grid);
box.append (stickykeys_grid);

12
pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
View File

@@ -31,13 +31,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-mdfmCzR9ikXDlDc7FeOITsdbPbz+G66jUrl1BobY+g8=";
};
/*
This allows `elementary-session-settings` to not use gnome-keyring's ssh capabilities anymore, as they have been
moved to gcr upstream, in an effort to modularize gnome-keyring.
More info can be found here: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/60
*/
patches = [ ./no-gnome-keyring-ssh-autostart.patch ];
patches = [
# See https://github.com/elementary/session-settings/issues/88 for gnome-keyring.
# See https://github.com/elementary/session-settings/issues/82 for onboard.
./no-autostart.patch
];
nativeBuildInputs = [
desktop-file-utils

7
pkgs/desktops/pantheon/desktop/elementary-session-settings/no-gnome-keyring-ssh-autostart.patch → pkgs/desktops/pantheon/desktop/elementary-session-settings/no-autostart.patch
View File

@@ -1,12 +1,13 @@
diff --git a/session/meson.build b/session/meson.build
index 501e836..3254658 100644
index 3e23650..e1f9792 100644
--- a/session/meson.build
+++ b/session/meson.build
@@ -79,7 +79,6 @@ if get_option('detect-program-prefixes') == true
@@ -79,8 +79,6 @@ if get_option('detect-program-prefixes') == true
autostarts = {
'gnome-keyring-pkcs11': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-pkcs11.desktop'),
'gnome-keyring-secrets': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-secrets.desktop'),
- 'gnome-keyring-ssh': join_paths(gnome_keyring_prefix, 'etc/xdg/autostart', 'gnome-keyring-ssh.desktop'),
'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'),
- 'onboard-autostart': join_paths(onboard_prefix, 'etc/xdg/autostart', 'onboard-autostart.desktop'),
'orca-autostart': join_paths(orca_prefix, 'etc/xdg/autostart', 'orca-autostart.desktop'),
}
else

40
pkgs/desktops/pantheon/desktop/gala/default.nix
View File

@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
desktop-file-utils,
gettext,
libxml2,
@@ -11,7 +10,7 @@
pkg-config,
vala,
wayland-scanner,
wrapGAppsHook3,
wrapGAppsHook4,
at-spi2-core,
gnome-settings-daemon,
gnome-desktop,
@@ -19,7 +18,6 @@
granite7,
gtk3,
gtk4,
libcanberra,
libgee,
libhandy,
mutter,
@@ -30,28 +28,15 @@
stdenv.mkDerivation rec {
pname = "gala";
version = "8.2.5";
version = "8.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = "gala";
rev = version;
hash = "sha256-uupFeQ73hr6ziLEtzgVJWASUxhspXJX54/U+3PLSCFY=";
tag = version;
hash = "sha256-omsAOOZCQINLTZQg3Sew+p84jv8+R2cHSVtcHFIeUBI=";
};
patches = [
# We look for plugins in `/run/current-system/sw/lib/` because
# there are multiple plugin providers (e.g. gala and wingpanel).
./plugins-dir.patch
# Fix gtk3 daemon menu location with x2 scaling
# https://github.com/elementary/gala/pull/2493
(fetchpatch {
url = "https://github.com/elementary/gala/commit/33bc3ebe7f175c61845feaf2d06083f1e3b64ddc.patch";
hash = "sha256-hjjiKcO5o/OABKD8vUsVyqtNKN4ffEOGZntLceLr2+k=";
})
];
depsBuildBuild = [ pkg-config ];
nativeBuildInputs = [
@@ -63,7 +48,7 @@ stdenv.mkDerivation rec {
pkg-config
vala
wayland-scanner
wrapGAppsHook3
wrapGAppsHook4
];
buildInputs = [
@@ -72,9 +57,8 @@ stdenv.mkDerivation rec {
gnome-desktop
granite
granite7
gtk3
gtk4 # gala-daemon
libcanberra
gtk3 # daemon-gtk3
gtk4
libgee
libhandy
mutter
@@ -82,6 +66,16 @@ stdenv.mkDerivation rec {
systemd
];
postPatch = ''
substituteInPlace meson.build \
--replace-fail "conf.set('PLUGINDIR', plugins_dir)" "conf.set('PLUGINDIR','/run/current-system/sw/lib/gala/plugins')"
'';
mesonFlags = [
# https://github.com/elementary/gala/commit/1e75d2a4b42e0d853fd474e90f1a52b0bcd0f690
"-Dold-icon-groups=true"
];
passthru = {
updateScript = nix-update-script { };
};

21
pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch
View File

@@ -1,21 +0,0 @@
diff --git a/meson.build b/meson.build
index d0f00e5..977d2e2 100644
--- a/meson.build
+++ b/meson.build
@@ -25,6 +25,7 @@ vapi_dir = meson.current_source_dir() / 'vapi'
locale_dir = join_paths(get_option('prefix'), get_option('localedir'))
data_dir = join_paths(get_option('prefix'), get_option('datadir'))
plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins')
+plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins')
pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())
pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name())
@@ -33,7 +34,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
conf.set_quoted('LOCALEDIR', locale_dir)
conf.set_quoted('DATADIR', data_dir)
conf.set_quoted('PKGDATADIR', pkgdata_dir)
-conf.set_quoted('PLUGINDIR', plugins_dir)
+conf.set_quoted('PLUGINDIR', plugins_dir_for_build)
conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala')
conf.set_quoted('VERSION', gala_version)
conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala')

7
pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/default.nix
View File

@@ -32,6 +32,13 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-82XlZDnXuUB0PPmInrSQh1vrwnOYt9RplKWwYxIirVo=";
};
patches = [
# We no longer ship Pantheon X11 session in NixOS.
# https://github.com/elementary/session-settings/issues/91
# https://github.com/elementary/session-settings/issues/82
./hide-onscreen-keyboard-settings.patch
];
nativeBuildInputs = [
glib # glib-compile-resources
meson

25
pkgs/desktops/pantheon/desktop/wingpanel-indicators/quick-settings/hide-onscreen-keyboard-settings.patch Normal file
View File

@@ -0,0 +1,25 @@
diff --git a/src/PopoverWidget.vala b/src/PopoverWidget.vala
index 9dd331c..438fbe0 100644
--- a/src/PopoverWidget.vala
+++ b/src/PopoverWidget.vala
@@ -123,7 +123,6 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
if (server_type == GREETER || glib_settings.get_boolean ("show-a11y")) {
toggle_box.add (screen_reader);
- toggle_box.add (onscreen_keyboard);
scale_box.add (text_scale);
}
@@ -131,12 +130,10 @@ public class QuickSettings.PopoverWidget : Gtk.Box {
glib_settings.changed["show-a11y"].connect (() => {
if (glib_settings.get_boolean ("show-a11y") && screen_reader.parent == null) {
toggle_box.add (screen_reader);
- toggle_box.add (onscreen_keyboard);
scale_box.add (text_scale);
} else {
toggle_box.remove (screen_reader);
- toggle_box.remove (onscreen_keyboard);
scale_box.remove (text_scale);
}

8
pkgs/desktops/pantheon/desktop/wingpanel/default.nix
View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
nix-update-script,
wayland-scanner,
wrapGAppsHook3,
@@ -35,6 +36,13 @@ stdenv.mkDerivation rec {
patches = [
./indicators.patch
# Fix build with gala 8.3.0
# https://github.com/elementary/wingpanel/pull/642
(fetchpatch {
url = "https://github.com/elementary/wingpanel/commit/4476df2573797310e254695a66c099b32afe9736.patch";
hash = "sha256-99zzXbaeW/ijqPXN7tQexMPWsUW4pX7e0tcxASBVbvI=";
})
];
depsBuildBuild = [

36
pkgs/desktops/pantheon/services/elementary-notifications/default.nix
View File

@@ -7,42 +7,48 @@
ninja,
pkg-config,
vala,
gtk3,
gtk4,
glib,
granite,
libgee,
libhandy,
libcanberra-gtk3,
wrapGAppsHook3,
granite7,
libadwaita,
libcanberra,
wayland-scanner,
wrapGAppsHook4,
}:
stdenv.mkDerivation rec {
pname = "elementary-notifications";
version = "8.1.0";
version = "8.1.1";
src = fetchFromGitHub {
owner = "elementary";
repo = "notifications";
rev = version;
sha256 = "sha256-2+LV3O2V42gI+ysVoeO9KpLqmAj/Zk5F8LzO2RNZ1ZY=";
tag = version;
hash = "sha256-V884jv7bleDMsuZDkodyeNBhStIoNPNxfT6mz1YjHXE=";
};
strictDeps = true;
depsBuildBuild = [
pkg-config
];
nativeBuildInputs = [
glib # for glib-compile-schemas
meson
ninja
pkg-config
vala
wrapGAppsHook3
wayland-scanner
wrapGAppsHook4
];
buildInputs = [
glib
granite
gtk3
libcanberra-gtk3
libgee
libhandy
granite7
gtk4
libadwaita
libcanberra
];
passthru = {