cinnamon.cinnamon-control-center: 5.2.0 -> 5.4.4
dbus-glib is not needed since 4.6.2. upower-glib is added when adapting to muffin changes.
This commit is contained in:
parent
969faa4270
commit
a9dd1f9bc9
1 changed files with 14 additions and 6 deletions
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, glib
|
, glib
|
||||||
, gettext
|
, gettext
|
||||||
|
@ -14,7 +15,6 @@
|
||||||
, polkit
|
, polkit
|
||||||
, libxkbfile
|
, libxkbfile
|
||||||
, cinnamon-menus
|
, cinnamon-menus
|
||||||
, dbus-glib
|
|
||||||
, libgnomekbd
|
, libgnomekbd
|
||||||
, libxklavier
|
, libxklavier
|
||||||
, networkmanager
|
, networkmanager
|
||||||
|
@ -31,17 +31,27 @@
|
||||||
, ninja
|
, ninja
|
||||||
, cinnamon-translations
|
, cinnamon-translations
|
||||||
, python3
|
, python3
|
||||||
|
, upower
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cinnamon-control-center";
|
pname = "cinnamon-control-center";
|
||||||
version = "5.2.0";
|
version = "5.4.4";
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Add missing gio-unix-2.0 dependency, can be removed on next update
|
||||||
|
# https://github.com/linuxmint/cinnamon-control-center/pull/294
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/linuxmint/cinnamon-control-center/commit/7f5ba6e7a691547840f8482445c09c729e10a397.patch";
|
||||||
|
sha256 = "sha256-xcf/O/DfhOvCpWJl0XZD+xAwWs4STAeCaFMZ9Lftv2w=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "linuxmint";
|
owner = "linuxmint";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = version;
|
rev = version;
|
||||||
hash = "sha256-j7+2uLcHr7bO7i8OGqkw3ifawZULNyihhJ+h2D5gx/k=";
|
hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0=";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -51,7 +61,6 @@ stdenv.mkDerivation rec {
|
||||||
libnotify
|
libnotify
|
||||||
cinnamon-menus
|
cinnamon-menus
|
||||||
libxml2
|
libxml2
|
||||||
dbus-glib
|
|
||||||
polkit
|
polkit
|
||||||
libgnomekbd
|
libgnomekbd
|
||||||
libxklavier
|
libxklavier
|
||||||
|
@ -66,6 +75,7 @@ stdenv.mkDerivation rec {
|
||||||
xorg.libXxf86misc
|
xorg.libXxf86misc
|
||||||
xorg.libxkbfile
|
xorg.libxkbfile
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
|
upower
|
||||||
];
|
];
|
||||||
|
|
||||||
/* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/"
|
/* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/"
|
||||||
|
@ -88,8 +98,6 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
mesonFlags = [
|
mesonFlags = [
|
||||||
# TODO: https://github.com/NixOS/nixpkgs/issues/36468
|
|
||||||
"-Dc_args=-I${glib.dev}/include/gio-unix-2.0"
|
|
||||||
# use locales from cinnamon-translations
|
# use locales from cinnamon-translations
|
||||||
"--localedir=${cinnamon-translations}/share/locale"
|
"--localedir=${cinnamon-translations}/share/locale"
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in a new issue