diff options
| author | Maciej Krüger <mkg20001@gmail.com> | 2021-02-06 14:44:31 +0100 |
|---|---|---|
| committer | Maciej Krüger <mkg20001@gmail.com> | 2021-04-19 14:40:33 +0200 |
| commit | fd5331d9a6f912f55c2f60f16004d5f778276f7a (patch) | |
| tree | 258ecc0a1ed694c63c5e5f1d86726156bcbb9598 /pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | |
| parent | faaeacd1c6dd14b48e3982d6ba13a45583111698 (diff) | |
| download | nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.tar nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.tar.gz nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.tar.bz2 nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.tar.lz nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.tar.xz nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.tar.zst nixpkgs-fd5331d9a6f912f55c2f60f16004d5f778276f7a.zip | |
cinnamon.cinnamon-settings-daemon: 4.6.4 -> 4.8.5
Diffstat (limited to 'pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index c5bae4e5767..200c2ec8f70 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -1,12 +1,9 @@ { fetchFromGitHub -, autoconf-archive -, autoreconfHook , cinnamon-desktop , colord , glib , gsettings-desktop-schemas , gtk3 -, intltool , lcms2 , libcanberra-gtk3 , libgnomekbd @@ -29,11 +26,15 @@ , tzdata , nss , libgudev +, meson +, ninja +, dbus +, dbus-glib }: stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "4.6.4"; + version = "4.8.5"; /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory #include "csd-power-proxy.h" @@ -48,14 +49,15 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "1xcjzjfwnzvkv9jiyw8adsjyhz92almzhyfwb91115774zgqnb7m"; + sha256 = "sha256-PAWVTjGFs8yKXgNQ2ucDnEDS+n7bp2n3lhGl9gHXfdQ="; }; patches = [ ./csd-backlight-helper-fix.patch + ./use-sane-install-dir.patch ]; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; buildInputs = [ cinnamon-desktop @@ -85,13 +87,14 @@ stdenv.mkDerivation rec { fontconfig nss libgudev + dbus + dbus-glib ]; nativeBuildInputs = [ - autoconf-archive - autoreconfHook + meson + ninja wrapGAppsHook - intltool pkg-config ]; |