diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-06-01 21:30:29 +0800 |
|---|---|---|
| committer | Bobby Rong <rjl931189261@126.com> | 2023-06-14 15:47:20 +0800 |
| commit | 70cc177a30287b2675a7cf99854b31704e942653 (patch) | |
| tree | ab6182904a6db48d040c7a1d027a1befd90cc1a8 /pkgs/desktops | |
| parent | 91e2d86304560c55bb7f3034be1579cb8f3978b8 (diff) | |
cinnamon.cinnamon-settings-daemon: 5.6.2 -> 5.8.1
https://github.com/linuxmint/cinnamon-settings-daemon/compare/5.6.2...5.8.1
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-settings-daemon/use-sane-install-dir.patch | 27 |
2 files changed, 2 insertions, 30 deletions
diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 5f7ad87d83cbe..9eb2d743d8e4a 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 d980431f81b9b..0000000000000 --- 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?= <mkg20001@gmail.com> -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 - |