cinnamon.cinnamon-common: Do not install online accounts module
Use GNOME Online Accounts GTK instead.
This commit is contained in:
parent
fae132c6e3
commit
7fbd6fefea
1 changed files with 20 additions and 7 deletions
|
@ -9,6 +9,7 @@
|
||||||
, cjs
|
, cjs
|
||||||
, evolution-data-server
|
, evolution-data-server
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, gdk-pixbuf
|
, gdk-pixbuf
|
||||||
, gettext
|
, gettext
|
||||||
, libgnomekbd
|
, libgnomekbd
|
||||||
|
@ -83,6 +84,13 @@ stdenv.mkDerivation rec {
|
||||||
patches = [
|
patches = [
|
||||||
./use-sane-install-dir.patch
|
./use-sane-install-dir.patch
|
||||||
./libdir.patch
|
./libdir.patch
|
||||||
|
|
||||||
|
# Switch to GNOME Online Accounts GTK
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch";
|
||||||
|
includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ];
|
||||||
|
hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8=";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -140,13 +148,6 @@ stdenv.mkDerivation rec {
|
||||||
pkg-config
|
pkg-config
|
||||||
];
|
];
|
||||||
|
|
||||||
# Use locales from cinnamon-translations.
|
|
||||||
# FIXME: Upstream does not respect localedir option from Meson currently.
|
|
||||||
# https://github.com/linuxmint/cinnamon/pull/11244#issuecomment-1305855783
|
|
||||||
postInstall = ''
|
|
||||||
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
|
||||||
'';
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
find . -type f -exec sed -i \
|
find . -type f -exec sed -i \
|
||||||
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
|
-e s,/usr/share/cinnamon,$out/share/cinnamon,g \
|
||||||
|
@ -173,6 +174,18 @@ stdenv.mkDerivation rec {
|
||||||
patchShebangs src/data-to-c.pl
|
patchShebangs src/data-to-c.pl
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
postInstall = ''
|
||||||
|
# Use locales from cinnamon-translations.
|
||||||
|
ln -s ${cinnamon-translations}/share/locale $out/share/locale
|
||||||
|
|
||||||
|
# Do not install online accounts module, with a -Donlineaccounts=false c-c-c
|
||||||
|
# this just shows an empty page.
|
||||||
|
rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py
|
||||||
|
|
||||||
|
# g-o-a-gtk already provides its own desktop item.
|
||||||
|
rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop
|
||||||
|
'';
|
||||||
|
|
||||||
preFixup = ''
|
preFixup = ''
|
||||||
# https://github.com/NixOS/nixpkgs/issues/101881
|
# https://github.com/NixOS/nixpkgs/issues/101881
|
||||||
gappsWrapperArgs+=(
|
gappsWrapperArgs+=(
|
||||||
|
|
Loading…
Reference in a new issue