From 4018579f3639b91fb2deed000c0c724e8c66112b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 7 Sep 2025 17:03:13 +0800 Subject: [PATCH 1/4] cinnamon-control-center: 6.4.1 -> 6.4.2 https://github.com/linuxmint/cinnamon-control-center/compare/6.4.1...6.4.2 --- pkgs/by-name/ci/cinnamon-control-center/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-control-center/package.nix b/pkgs/by-name/ci/cinnamon-control-center/package.nix index 64fc0d1f8f3b..96f1e1a38059 100644 --- a/pkgs/by-name/ci/cinnamon-control-center/package.nix +++ b/pkgs/by-name/ci/cinnamon-control-center/package.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "6.4.1"; + version = "6.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-control-center"; rev = version; - hash = "sha256-1Z+kXvBmENNXIqdZgPDx7ZSwJMFAm2oMih6eFFAsA/A="; + hash = "sha256-nw70sbiz3+dp40WP957hOVo/mQOg2MJknZNN5Kw/Q/0="; }; buildInputs = [ From 1c988dde150edc3b6dda396194e1ad74a6a93d2c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 7 Sep 2025 17:03:39 +0800 Subject: [PATCH 2/4] cinnamon-desktop: 6.4.1 -> 6.4.2 https://github.com/linuxmint/cinnamon-desktop/compare/6.4.1...6.4.2 --- pkgs/by-name/ci/cinnamon-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index ece170d57a4c..df1c5ad8f513 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "6.4.1"; + version = "6.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-desktop"; rev = version; - hash = "sha256-YKGVuT28MLcLO9T8ZJqbHqMN0SAn1P1l8JTDBo4n838="; + hash = "sha256-kNxVdPtCQtz4TSyCc6uKHmAGWm2nlWnLwC3Cm0E42Jc="; }; outputs = [ From 7b0a56e6ce9769f43fdda0cebbe0dad8316b750a Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 7 Sep 2025 17:03:49 +0800 Subject: [PATCH 3/4] cinnamon-session: 6.4.0 -> 6.4.1 https://github.com/linuxmint/cinnamon-session/compare/6.4.0...6.4.1 --- pkgs/by-name/ci/cinnamon-session/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index b9b27f88c3c4..a17ef8e7c3b4 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.4.0"; + version = "6.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-session"; rev = version; - hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU="; + hash = "sha256-xmKreYrdN22bz5JRkpocf+dfK7BY1Ic4F+mTax0lM3Y="; }; buildInputs = [ From f20519d66a57581ef8bf767147c598fe8c1d45c9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 7 Sep 2025 17:11:57 +0800 Subject: [PATCH 4/4] muffin: Fix Qt apps crashing on wayland --- pkgs/by-name/mu/muffin/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/mu/muffin/package.nix b/pkgs/by-name/mu/muffin/package.nix index a6e5f521e004..0844df43a89b 100644 --- a/pkgs/by-name/mu/muffin/package.nix +++ b/pkgs/by-name/mu/muffin/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, replaceVars, cairo, cinnamon-desktop, @@ -62,6 +63,13 @@ stdenv.mkDerivation rec { (replaceVars ./fix-paths.patch { inherit zenity; }) + + # Fix Qt apps crashing on wayland + # https://github.com/linuxmint/muffin/pull/739 + (fetchpatch { + url = "https://github.com/linuxmint/muffin/commit/760e2a3046e13610c4fda1291a9a28e589d2bd93.patch"; + hash = "sha256-D0u8UxW5USzMW9KlP3Y4XCWxrQ1ySufDv+eCbrAP71c="; + }) ]; nativeBuildInputs = [