diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 5f7ad87d83c..9eb2d743d8e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,18 +32,17 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.6.2"; + version = "5.8.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-IqYfHMjKe7gVsM6HgihQMNkcXSYBOft1lamXOLa1Y8k="; + hash = "sha256-2ObfUdrCuvyhtpoxNzoH8tsFQLxNkMLQPFfJajXEsXU="; }; patches = [ ./csd-backlight-helper-fix.patch - ./use-sane-install-dir.patch ]; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch deleted file mode 100644 index d980431f81b..00000000000 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch +++ /dev/null @@ -1,27 +0,0 @@ -From be57c01e6595a8e08ecc17de298e30640b532f11 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Sat, 6 Feb 2021 13:55:03 +0100 -Subject: [PATCH] use sane install-dir - ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 0e11d50..54f4637 100644 ---- a/meson.build -+++ b/meson.build -@@ -156,8 +156,8 @@ subdir('cinnamon-settings-daemon') - subdir('plugins') - - install_subdir( -- 'files', -- install_dir: '/', -+ 'files/usr', -+ install_dir: get_option('prefix'), - strip_directory: true, - ) - --- -2.30.0 -