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

cinnamon.cinnamon-settings-daemon: 4.6.4 -> 4.8.5

Browse Source
This commit is contained in:
Maciej Krüger 2021-02-06 14:44:31 +01:00
parent faaeacd1c6
commit fd5331d9a6
No known key found for this signature in database
GPG Key ID: 0D948CE19CF49C5F
3 changed files with 54 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/desktops/cinnamon/cinnamon-settings-daemon/csd-backlight-helper-fix.patch
View File

@ -1,4 +1,4 @@
From 6d71bf9764fb81d437678a603826167850bbf453 Mon Sep 17 00:00:00 2001
From 7fa408ebd72c9f1ff7ff4e9d7f4a811465a8a41b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Tue, 21 Jan 2020 03:19:28 +0100
Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
@ -6,35 +6,35 @@ Subject: [PATCH] fix: use an impure path to csd-backlight-helper to fix
---
plugins/power/csd-power-manager.c | 4 ++--
.../org.cinnamon.settings-daemon.plugins.power.policy.in.in | 2 +-
.../org.cinnamon.settings-daemon.plugins.power.policy.in | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/power/csd-power-manager.c b/plugins/power/csd-power-manager.c
index b24c456..212c47e 100755
index 33f4489..84dd98b 100644
--- a/plugins/power/csd-power-manager.c
+++ b/plugins/power/csd-power-manager.c
@@ -2519,7 +2519,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
@@ -2529,7 +2529,7 @@ backlight_helper_get_value (const gchar *argument, CsdPowerManager* manager,
#endif
/* get the data */
- command = g_strdup_printf (LIBEXECDIR "/csd-backlight-helper --%s %s",
+ command = g_strdup_printf ("/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %s",
argument,
manager->priv->backlight_helper_preference_args);
ret = g_spawn_command_line_sync (command,
@@ -2609,7 +2609,7 @@ backlight_helper_set_value (const gchar *argument,
@@ -2619,7 +2619,7 @@ backlight_helper_set_value (const gchar *argument,
#endif
/* get the data */
- command = g_strdup_printf ("pkexec " LIBEXECDIR "/csd-backlight-helper --%s %i %s",
+ command = g_strdup_printf ("pkexec " "/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper --%s %i %s",
argument, value,
manager->priv->backlight_helper_preference_args);
ret = g_spawn_command_line_sync (command,
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
index 2c44e62..c0a2348 100755
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in.in
diff --git a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
index 504f017..3569e8c 100644
--- a/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
+++ b/plugins/power/org.cinnamon.settings-daemon.plugins.power.policy.in
@@ -25,7 +25,7 @@
<allow_inactive>no</allow_inactive>
<allow_active>yes</allow_active>
@ -42,7 +42,8 @@ index 2c44e62..c0a2348 100755
- <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/csd-backlight-helper</annotate>
+ <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper</annotate>
</action>
</policyconfig>
--
2.24.1
--
2.30.0

21
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
View File

@ -1,12 +1,9 @@
{ fetchFromGitHub
, autoconf-archive
, autoreconfHook
, cinnamon-desktop
, colord
, glib
, gsettings-desktop-schemas
, gtk3
, intltool
, lcms2
, libcanberra-gtk3
, libgnomekbd
@ -29,11 +26,15 @@
, tzdata
, nss
, libgudev
, meson
, ninja
, dbus
, dbus-glib
}:
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "4.6.4";
version = "4.8.5";
/* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory
#include "csd-power-proxy.h"
@ -48,14 +49,15 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "1xcjzjfwnzvkv9jiyw8adsjyhz92almzhyfwb91115774zgqnb7m";
sha256 = "sha256-PAWVTjGFs8yKXgNQ2ucDnEDS+n7bp2n3lhGl9gHXfdQ=";
};
patches = [
./csd-backlight-helper-fix.patch
./use-sane-install-dir.patch
];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
buildInputs = [
cinnamon-desktop
@ -85,13 +87,14 @@ stdenv.mkDerivation rec {
fontconfig
nss
libgudev
dbus
dbus-glib
];
nativeBuildInputs = [
autoconf-archive
autoreconfHook
meson
ninja
wrapGAppsHook
intltool
pkg-config
];

27
pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch Normal file
View File

@ -0,0 +1,27 @@
From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 6 Feb 2021 13:55:03 +0100
Subject: [PATCH] use sane install-dir
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 0e11d50..54f4637 100644
--- a/meson.build
+++ b/meson.build
@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon')
subdir('plugins')
install_subdir(
- 'files',
- install_dir: '/',
+ 'files/usr',
+ install_dir: get_option('prefix'),
strip_directory: true,
)
--
2.30.0