uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
|
|
@ -0,0 +1,49 @@
|
|||
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
|
||||
policy-reload bug
|
||||
|
||||
---
|
||||
plugins/power/csd-power-manager.c | 4 ++--
|
||||
.../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 33f4489..84dd98b 100644
|
||||
--- a/plugins/power/csd-power-manager.c
|
||||
+++ b/plugins/power/csd-power-manager.c
|
||||
@@ -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,
|
||||
@@ -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 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>
|
||||
</defaults>
|
||||
- <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.30.0
|
||||
|
||||
127
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
Normal file
127
pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
{ fetchFromGitHub
|
||||
, cinnamon-desktop
|
||||
, cinnamon-translations
|
||||
, colord
|
||||
, glib
|
||||
, gsettings-desktop-schemas
|
||||
, gtk3
|
||||
, lcms2
|
||||
, libcanberra-gtk3
|
||||
, libgnomekbd
|
||||
, libnotify
|
||||
, libxklavier
|
||||
, wrapGAppsHook
|
||||
, pkg-config
|
||||
, pulseaudio
|
||||
, lib
|
||||
, stdenv
|
||||
, systemd
|
||||
, upower
|
||||
, dconf
|
||||
, cups
|
||||
, polkit
|
||||
, librsvg
|
||||
, libwacom
|
||||
, xf86_input_wacom
|
||||
, xorg
|
||||
, fontconfig
|
||||
, tzdata
|
||||
, nss
|
||||
, 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;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-6omif4UxMrXWxL+R9lQ8ogxotW+3E9Kp99toH3PJtaU=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./csd-backlight-helper-fix.patch
|
||||
./use-sane-install-dir.patch
|
||||
];
|
||||
|
||||
mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ];
|
||||
|
||||
buildInputs = [
|
||||
cinnamon-desktop
|
||||
colord
|
||||
gtk3
|
||||
glib
|
||||
gsettings-desktop-schemas
|
||||
lcms2
|
||||
libcanberra-gtk3
|
||||
libgnomekbd
|
||||
libnotify
|
||||
libxklavier
|
||||
pulseaudio
|
||||
systemd
|
||||
upower
|
||||
dconf
|
||||
cups
|
||||
polkit
|
||||
librsvg
|
||||
libwacom
|
||||
xf86_input_wacom
|
||||
xorg.libXext
|
||||
xorg.libX11
|
||||
xorg.libXi
|
||||
xorg.libXtst
|
||||
xorg.libXfixes
|
||||
fontconfig
|
||||
nss
|
||||
libgudev
|
||||
dbus
|
||||
dbus-glib
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
meson
|
||||
ninja
|
||||
wrapGAppsHook
|
||||
pkg-config
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
postPatch = ''
|
||||
sed "s|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g" -i plugins/datetime/system-timezone.h
|
||||
'';
|
||||
|
||||
# use locales from cinnamon-translations (not using --localedir because datadir is used)
|
||||
postInstall = ''
|
||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||
'';
|
||||
|
||||
# So the polkit policy can reference /run/current-system/sw/bin/cinnamon-settings-daemon/csd-backlight-helper
|
||||
postFixup = ''
|
||||
mkdir -p $out/bin/cinnamon-settings-daemon
|
||||
ln -s $out/libexec/csd-backlight-helper $out/bin/cinnamon-settings-daemon/csd-backlight-helper
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/linuxmint/cinnamon-settings-daemon";
|
||||
description = "The settings daemon for the Cinnamon desktop";
|
||||
license = licenses.gpl2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = teams.cinnamon.members;
|
||||
};
|
||||
}
|
||||
|
|
@ -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
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue