cinnamon.muffin: 5.8.1 -> 6.0.0

https://github.com/linuxmint/muffin/compare/5.8.1...6.0.0

Restores wayland support.
bc10efe828
This commit is contained in:
Bobby Rong 2023-11-19 23:00:52 +08:00
parent 4253d19b64
commit 08b6183fb7
No known key found for this signature in database

View File

@ -6,6 +6,7 @@
, cinnamon-desktop , cinnamon-desktop
, dbus , dbus
, desktop-file-utils , desktop-file-utils
, egl-wayland
, glib , glib
, gnome , gnome
, gobject-introspection , gobject-introspection
@ -19,6 +20,7 @@
, libinput , libinput
, libstartup_notification , libstartup_notification
, libwacom , libwacom
, libxcvt
, libXdamage , libXdamage
, libxkbcommon , libxkbcommon
, libXtst , libXtst
@ -29,13 +31,16 @@
, pkg-config , pkg-config
, python3 , python3
, udev , udev
, wayland
, wayland-protocols
, wrapGAppsHook , wrapGAppsHook
, xorgserver , xorgserver
, xwayland
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "muffin"; pname = "muffin";
version = "5.8.1"; version = "6.0.0";
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
@ -43,7 +48,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint"; owner = "linuxmint";
repo = pname; repo = pname;
rev = version; rev = version;
hash = "sha256-9YE+pHXJb21CcAflL9swNyhQY3ZCkLlZbnmUwTNdyfA="; hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8=";
}; };
patches = [ patches = [
@ -69,6 +74,7 @@ stdenv.mkDerivation rec {
cairo cairo
cinnamon-desktop cinnamon-desktop
dbus dbus
egl-wayland
glib glib
gtk3 gtk3
libcanberra libcanberra
@ -78,10 +84,14 @@ stdenv.mkDerivation rec {
libinput libinput
libstartup_notification libstartup_notification
libwacom libwacom
libxcvt
libXdamage libXdamage
libxkbcommon libxkbcommon
pipewire pipewire
udev udev
wayland
wayland-protocols
xwayland
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -91,6 +101,13 @@ stdenv.mkDerivation rec {
graphene graphene
]; ];
mesonFlags = [
# Based on Mint's debian/rules.
"-Degl_device=true"
"-Dwayland_eglstream=true"
"-Dxwayland_path=${lib.getExe xwayland}"
];
postPatch = '' postPatch = ''
patchShebangs src/backends/native/gen-default-modes.py patchShebangs src/backends/native/gen-default-modes.py
''; '';