From 969faa4270061244a72d2f0592f1fb7bd2cf92d3 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Mon, 18 Jul 2022 12:34:08 +0800
Subject: cinnamon.cinnamon-settings-daemon: 5.2.0 -> 5.4.3

Removed pulseaudio as dependency because the sound plugin was removed.
Removed dbus{,-glib} as dependency as they now use Gio's dbus implementation.
---
 .../cinnamon/cinnamon-settings-daemon/default.nix   | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix')

diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
index bf83c3d9f59..d4d05df8f55 100644
--- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
@@ -12,7 +12,6 @@
 , libxklavier
 , wrapGAppsHook
 , pkg-config
-, pulseaudio
 , lib
 , stdenv
 , systemd
@@ -30,28 +29,17 @@
 , libgudev
 , meson
 , ninja
-, dbus
-, dbus-glib
 }:
 
 stdenv.mkDerivation rec {
   pname = "cinnamon-settings-daemon";
-  version = "5.2.0";
-
-  /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory
-   #include "csd-power-proxy.h"
-            ^~~~~~~~~~~~~~~~~~~
-  compilation terminated. */
-
-  # but this occurs only sometimes, so disabling parallel building
-  # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248
-  enableParallelBuilding = false;
+  version = "5.4.3";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-6omif4UxMrXWxL+R9lQ8ogxotW+3E9Kp99toH3PJtaU=";
+    hash = "sha256-3ELsb0hH7GjMjwjsIg2m8k/EBCHIQGW3O7eDaqT2V7I=";
   };
 
   patches = [
@@ -59,8 +47,6 @@ stdenv.mkDerivation rec {
     ./use-sane-install-dir.patch
   ];
 
-  mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
-
   buildInputs = [
     cinnamon-desktop
     colord
@@ -72,7 +58,6 @@ stdenv.mkDerivation rec {
     libgnomekbd
     libnotify
     libxklavier
-    pulseaudio
     systemd
     upower
     dconf
@@ -89,8 +74,6 @@ stdenv.mkDerivation rec {
     fontconfig
     nss
     libgudev
-    dbus
-    dbus-glib
   ];
 
   nativeBuildInputs = [
-- 
cgit 1.4.1