diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-07-18 12:49:19 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-07-30 19:51:18 +0800 |
| commit | a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47 (patch) | |
| tree | 9f38450d48746729acd2f8b5e7645c6b357a2f52 /pkgs/desktops/cinnamon | |
| parent | 969faa4270061244a72d2f0592f1fb7bd2cf92d3 (diff) | |
| download | nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.tar nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.tar.gz nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.tar.bz2 nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.tar.lz nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.tar.xz nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.tar.zst nixpkgs-a9dd1f9bc94fc65f3dcdb0f2010bcc8e020fea47.zip | |
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.
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index a105f39ac46..6a8e344ba47 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , glib , gettext @@ -14,7 +15,6 @@ , polkit , libxkbfile , cinnamon-menus -, dbus-glib , libgnomekbd , libxklavier , networkmanager @@ -31,17 +31,27 @@ , ninja , cinnamon-translations , python3 +, upower }: stdenv.mkDerivation rec { 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 { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-j7+2uLcHr7bO7i8OGqkw3ifawZULNyihhJ+h2D5gx/k="; + hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0="; }; buildInputs = [ @@ -51,7 +61,6 @@ stdenv.mkDerivation rec { libnotify cinnamon-menus libxml2 - dbus-glib polkit libgnomekbd libxklavier @@ -66,6 +75,7 @@ stdenv.mkDerivation rec { xorg.libXxf86misc xorg.libxkbfile gdk-pixbuf + upower ]; /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" @@ -88,8 +98,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; |