From 76329597f0b4dd2d2a06e45ca2b08d3d1756b0e9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 22 Jun 2025 21:59:09 +0800 Subject: [PATCH] cinnamon-session: Remove unused dbus-glib * dbus-glib gone in https://github.com/linuxmint/cinnamon-session/commit/2d49e8ea97a00b1d8c4501376de07ce2bb2239f8. * elogind is already optional: there is "elogind = dependency('', required: false)" when it is not available. * glib is listed twice in buildInputs. --- ...001-Use-dbus_glib-instead-of-elogind.patch | 38 ------------------- pkgs/by-name/ci/cinnamon-session/package.nix | 7 ---- 2 files changed, 45 deletions(-) delete mode 100644 pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch diff --git a/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch deleted file mode 100644 index 368e49bb84aa..000000000000 --- a/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch +++ /dev/null @@ -1,38 +0,0 @@ -From eb4a1eae754f222b1be902c2f050704fb0511cf7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Sat, 5 Sep 2020 23:19:23 +0200 -Subject: [PATCH] Use dbus_glib instead of elogind - ---- - cinnamon-session/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build -index d8428dc..1f15115 100644 ---- a/cinnamon-session/meson.build -+++ b/cinnamon-session/meson.build -@@ -56,6 +56,7 @@ cinnamon_session_sources = [ - gdbus_sources, - ] - -+dbus_glib = dependency('dbus-glib-1') - executable('cinnamon-session-binary', - cinnamon_session_sources, - dependencies: [ -@@ -74,7 +75,7 @@ executable('cinnamon-session-binary', - xext, - xrender, - xtest, -- elogind, -+ dbus_glib, - ], - link_with: [ - libegg, -@@ -98,4 +99,3 @@ foreach unit: units - dependencies: unit[2] - ) - endforeach -- --- -2.28.0 - diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index d332997cfcf1..b9b27f88c3c4 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -3,7 +3,6 @@ cinnamon-desktop, cinnamon-settings-daemon, cinnamon-translations, - dbus-glib, glib, gsettings-desktop-schemas, gtk3, @@ -43,10 +42,6 @@ stdenv.mkDerivation rec { hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU="; }; - patches = [ - ./0001-Use-dbus_glib-instead-of-elogind.patch - ]; - buildInputs = [ # meson.build cinnamon-desktop @@ -68,8 +63,6 @@ stdenv.mkDerivation rec { # other (not meson.build) cinnamon-settings-daemon - dbus-glib - glib gsettings-desktop-schemas pythonEnv # for cinnamon-session-quit ];