diff options
| author | Bobby Rong <rjl931189261@126.com> | 2022-08-10 13:49:14 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2022-08-10 13:49:14 +0800 |
| commit | 880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2 (patch) | |
| tree | 6c5a34b2ebdfb8fef9d1aee26e5e9e1f7add1df8 /pkgs/desktops/cinnamon | |
| parent | a6d4e3d86ab1838dd5e0b4f1eb613f4ff6924e90 (diff) | |
| download | nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.tar nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.tar.gz nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.tar.bz2 nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.tar.lz nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.tar.xz nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.tar.zst nixpkgs-880e4a8e2456e448d4ea38d64a6a00ee5cc5e4e2.zip | |
cinnamon.cinnamon-control-center: 5.4.4 -> 5.4.6
Upstream don't really add gio-unix-2.0 as dependency when doing gdbus_codegen so this regressed again :-(
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 6a8e344ba47..dded4a9ff61 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , glib , gettext @@ -18,6 +17,7 @@ , libgnomekbd , libxklavier , networkmanager +, libgudev , libwacom , gnome , wrapGAppsHook @@ -36,22 +36,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - 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="; - }) - ]; + version = "5.4.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0="; + hash = "sha256-8BDmQT/xDnpwR2YC0TGaqWPnZ61IBmVvft2Mcf6YN+A="; }; buildInputs = [ @@ -66,6 +57,7 @@ stdenv.mkDerivation rec { libxklavier colord cinnamon-settings-daemon + libgudev libwacom gnome-online-accounts tzdata @@ -98,6 +90,8 @@ 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" ]; |