diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-05 12:01:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-05 12:01:30 +0000 |
| commit | 6458cb74a2d16d200ef040c881e3eb1c4378ad2d (patch) | |
| tree | 423239861f2711307dc0f8f8f9b8521ec7104c51 /pkgs/desktops/cinnamon | |
| parent | 91c8b652dbbc8eff5007621ba32cf66ee28a218c (diff) | |
| parent | 0d98427489fd368378069a56a094c452d9ad8b7f (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/desktops/cinnamon')
| -rw-r--r-- | pkgs/desktops/cinnamon/xreader/default.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index d6bf6c1faaaeb..1da859b3cd170 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , glib , gobject-introspection , intltool @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-2zqlfoN4L+V237cQ3PVh49YaZfNKGiLqh2JIiGJE340="; }; + patches = [ + # Fix build with meson 1.2, can be dropped on next bump + # https://github.com/linuxmint/xreader/issues/612 + (fetchpatch { + url = "https://github.com/linuxmint/xreader/commit/06b18a884c8cf3257ea1f053a82784da078999ed.patch"; + sha256 = "sha256-+LXEW3OkfhkIcbxtvfQYjdaC18O8imOx22t91ad/XZw="; + }) + ]; + nativeBuildInputs = [ shared-mime-info wrapGAppsHook |