[packaging] Fix packaging to have X11 and wayland variants while still passing QA