Merge pull request #132268 from Artturin/enlightwayland

enlightenment: add wayland support
This commit is contained in:
Jörg Thalheim 2021-08-01 07:51:15 +01:00 committed by GitHub
commit 7f1f43f32b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -13,6 +13,7 @@
, xkeyboard_config , xkeyboard_config
, udisks2 , udisks2
, waylandSupport ? false, wayland-protocols, xwayland
, bluetoothSupport ? true, bluez5 , bluetoothSupport ? true, bluez5
, pulseSupport ? !stdenv.isDarwin, libpulseaudio , pulseSupport ? !stdenv.isDarwin, libpulseaudio
}: }:
@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
] ]
++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
++ lib.optionals waylandSupport [ wayland-protocols xwayland ]
; ;
patches = [ patches = [
@ -62,7 +64,7 @@ stdenv.mkDerivation rec {
mesonFlags = [ mesonFlags = [
"-D systemdunitdir=lib/systemd/user" "-D systemdunitdir=lib/systemd/user"
]; ] ++ lib.optional waylandSupport "-Dwl=true";
passthru.providedSessions = [ "enlightenment" ]; passthru.providedSessions = [ "enlightenment" ];