git.iko.soy/typeable/nixpkgs
on master help sign in
cinnamon.cinnamon-settings-daemon: init at 4.4.0
commit2e2b4d39fc33e26da3a0c0fa3813d492bd9dc1fa authorMaciej Krüger <mkg20001@gmail.com> dateTue 21 Jan 2020, 02:32 (7 years ago) parent628164c
3 files changed+160
pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch+48 pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix+111 pkgs/desktops/cinnamon/default.nix+1
pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patchnew file+48
@@ -0,0 +1,48 @@
1+From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001
2+From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
3+Date: Tue, 21 Jan 2020 03:19:28 +0100
4+Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
5+ policy-reload bug
6+
7+---
8+ plugins/power/csd-power-manager.c | 4 ++--
9+ .../org.cinnamon.settings-daemon.plugins.power.policy.in.in | 2 +-
10+ 2 files changed, 3 insertions(+), 3 deletions(-)
11+
12+diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
13+index b24c456..212c47e 100755
14+--- a/plugins/power/csd-power-manager.c
15++++ b/plugins/power/csd-power-manager.c
16+@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
17+ #endif
18+
19+ /* get the data */
20+- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s",
21++ command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s",
22+ argument,
23+ manager->priv->backlight_helper_preference_args);
24+ ret = g_spawn_command_line_sync (command,
25+@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument,
26+ #endif
27+
28+ /* get the data */
29+- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s",
30++ command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s",
31+ argument, value,
32+ manager->priv->backlight_helper_preference_args);
33+ ret = g_spawn_command_line_sync (command,
34+diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
35+index 2c44e62..c0a2348 100755
36+--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
37++++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
38+@@ -25,7 +25,7 @@
39+ <allow_inactive>no</allow_inactive>
40+ <allow_active>yes</allow_active>
41+ </defaults>
42+- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate>
43++ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate>
44+ </action>
45+
46+ </policyconfig>
47+--
48+2.24.1
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nixnew file+111
@@ -0,0 +1,111 @@
1+{ fetchFromGitHub
2+, autoconf-archive
3+, autoreconfHook
4+, cinnamon-desktop
5+, colord
6+, glib
7+, gsettings-desktop-schemas
8+, gtk3
9+, intltool
10+, lcms2
11+, libcanberra-gtk3
12+, libgnomekbd
13+, libnotify
14+, libxklavier
15+, wrapGAppsHook
16+, pkgconfig
17+, pulseaudio
18+, stdenv
19+, systemd
20+, upower
21+, dconf
22+, cups
23+, polkit
24+, librsvg
25+, libwacom
26+, xf86_input_wacom
27+, xorg
28+, fontconfig
29+, tzdata
30+}:
31+
32+stdenv.mkDerivation rec {
33+ pname = "cinnamon-settings-daemon";
34+ version = "4.4.0";
35+
36+ /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory
37+ #include "csd-power-proxy.h"
38+ ^~~~~~~~~~~~~~~~~~~
39+ compilation terminated. */
40+
41+ # but this occurs only sometimes, so disabling parallel building
42+ # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248
43+ enableParallelBuilding = false;
44+
45+ src = fetchFromGitHub {
46+ owner = "linuxmint";
47+ repo = pname;
48+ rev = version;
49+ sha256 = "1h74d68a7hx85vv6ak26b85jq0wr56ps9rzfvqsnxwk81zxw2n7q";
50+ };
51+
52+ patches = [
53+ ./csd-backlight-helper-fix.patch
54+ ];
55+
56+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468
57+
58+ buildInputs = [
59+ cinnamon-desktop
60+ colord
61+ gtk3
62+ glib
63+ gsettings-desktop-schemas
64+ lcms2
65+ libcanberra-gtk3
66+ libgnomekbd
67+ libnotify
68+ libxklavier
69+ pulseaudio
70+ systemd
71+ upower
72+ dconf
73+ cups
74+ polkit
75+ librsvg
76+ libwacom
77+ xf86_input_wacom
78+ xorg.libXext
79+ xorg.libX11
80+ xorg.libXi
81+ xorg.libXtst
82+ xorg.libXfixes
83+ fontconfig
84+ ];
85+
86+ nativeBuildInputs = [
87+ autoconf-archive
88+ autoreconfHook
89+ wrapGAppsHook
90+ intltool
91+ pkgconfig
92+ ];
93+
94+ postPatch = ''
95+ sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h
96+ '';
97+
98+ # So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper
99+ postFixup = ''
100+ mkdir -p $out/bin/cinnamon-settings-daemon
101+ ln -s $out/libexec/csd-backlight-helper $out/bin/cinnamon-settings-daemon/csd-backlight-helper
102+ '';
103+
104+ meta = with stdenv.lib; {
105+ homepage = "https://github.com/linuxmint/cinnamon-settings-daemon";
106+ description = "The settings daemon for the Cinnamon desktop";
107+ license = licenses.gpl2;
108+ platforms = platforms.linux;
109+ maintainers = [ maintainers.mkg20001 ];
110+ };
111+}
pkgs/desktops/cinnamon/default.nix+1
@@ -4,6 +4,7 @@ lib.makeScope pkgs.newScope (self: with self; {
44 cinnamon-desktop = callPackage ./cinnamon-desktop { };
55 cinnamon-menus = callPackage ./cinnamon-menus { };
66 cinnamon-translations = callPackage ./cinnamon-translations { };
7+ cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
78 cjs = callPackage ./cjs { };
89 xapps = callPackage ./xapps { };
910})