mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
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:
parent
4253d19b64
commit
08b6183fb7
@ -6,6 +6,7 @@
|
||||
, cinnamon-desktop
|
||||
, dbus
|
||||
, desktop-file-utils
|
||||
, egl-wayland
|
||||
, glib
|
||||
, gnome
|
||||
, gobject-introspection
|
||||
@ -19,6 +20,7 @@
|
||||
, libinput
|
||||
, libstartup_notification
|
||||
, libwacom
|
||||
, libxcvt
|
||||
, libXdamage
|
||||
, libxkbcommon
|
||||
, libXtst
|
||||
@ -29,13 +31,16 @@
|
||||
, pkg-config
|
||||
, python3
|
||||
, udev
|
||||
, wayland
|
||||
, wayland-protocols
|
||||
, wrapGAppsHook
|
||||
, xorgserver
|
||||
, xwayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "muffin";
|
||||
version = "5.8.1";
|
||||
version = "6.0.0";
|
||||
|
||||
outputs = [ "out" "dev" "man" ];
|
||||
|
||||
@ -43,7 +48,7 @@ stdenv.mkDerivation rec {
|
||||
owner = "linuxmint";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-9YE+pHXJb21CcAflL9swNyhQY3ZCkLlZbnmUwTNdyfA=";
|
||||
hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -69,6 +74,7 @@ stdenv.mkDerivation rec {
|
||||
cairo
|
||||
cinnamon-desktop
|
||||
dbus
|
||||
egl-wayland
|
||||
glib
|
||||
gtk3
|
||||
libcanberra
|
||||
@ -78,10 +84,14 @@ stdenv.mkDerivation rec {
|
||||
libinput
|
||||
libstartup_notification
|
||||
libwacom
|
||||
libxcvt
|
||||
libXdamage
|
||||
libxkbcommon
|
||||
pipewire
|
||||
udev
|
||||
wayland
|
||||
wayland-protocols
|
||||
xwayland
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -91,6 +101,13 @@ stdenv.mkDerivation rec {
|
||||
graphene
|
||||
];
|
||||
|
||||
mesonFlags = [
|
||||
# Based on Mint's debian/rules.
|
||||
"-Degl_device=true"
|
||||
"-Dwayland_eglstream=true"
|
||||
"-Dxwayland_path=${lib.getExe xwayland}"
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs src/backends/native/gen-default-modes.py
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user