diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-03-22 06:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-22 06:01:23 +0000 |
| commit | bf57467402aea45ee8c15519d5a1d3063324d737 (patch) | |
| tree | 0fceda4d5a2194fec43862f4bcae2fd454b22fa4 /pkgs/desktops | |
| parent | 209875d860d0e8e8e10ed7968082fa5e00ef207b (diff) | |
| parent | 293e39ec0980f68ec04dcf9c6a6d95b8ca4b19da (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/xapp/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 07b557d65c0db..1c4330221a66f 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , glib , gobject-introspection , gtk3 @@ -33,6 +34,15 @@ stdenv.mkDerivation rec { hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM="; }; + patches = [ + # xapp-sn-watcher crashes on cinnamon with glib 2.76.0 + # https://github.com/linuxmint/xapp/issues/165 + (fetchpatch { + url = "https://github.com/linuxmint/xapp/commit/3ef9861d6228c2061fbde2c0554be5ae6f42befa.patch"; + sha256 = "sha256-7hYXA43UQpBLLjRVPoACc8xdhKyKnt3cDUBL4PhEtJY="; + }) + ]; + nativeBuildInputs = [ meson ninja |