Re: Conflict resolution (gtk, wayland)

2018-05-22 Thread Rutger Helling
I've just applied the patch to staging, thanks! Regarding the Wayland issue, it seems to have something to do with the Mesa update to the 18.x series. I've tried building master with a cherry-picked Mesa update and had the same problem. Maybe the newer wayland-egl is the problem. The problem's

Re: Conflict resolution (gtk, wayland)

2018-05-22 Thread Marius Bakke
Rutger Helling writes: > I've created a patch to update Mesa on staging, along with removing > wayland-egl from it. I can confirm I can still start GNOME on Wayland > manually after rebuilding with this patch. Excellent, thanks! > Should I apply this to staging now? It's

Re: Conflict resolution (gtk, wayland)

2018-05-22 Thread Rutger Helling
I've created a patch to update Mesa on staging, along with removing wayland-egl from it. I can confirm I can still start GNOME on Wayland manually after rebuilding with this patch. Should I apply this to staging now? It's been two weeks since the last commit to staging, and a merge doesn't seem

Re: Conflict resolution (gtk, wayland)

2018-05-17 Thread Ludovic Courtès
Hi, Rutger Helling skribis: > It's because Wayland recently absorbed libwayland-egl. See: > https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html > > Specifically: > "libwayland-egl is now part of libwayland, and will presumably be > removed from mesa

Re: Conflict resolution (gtk, wayland)

2018-05-14 Thread Ludovic Courtès
Hello, Pierre Neidhardt skribis: > Sometimes when updating or install packages, guix encounters conflicts. > It's usually smart enough to fix it by itself. > > That said, conflicts seems to be a telltale sign of bad packaging > (e.g. duplicate files in a package and its