On Fri, Jan 06, 2017 at 09:33:50PM +0100, Jan Nieuwenhuizen wrote: > Ludovic Courtès writes: > > >> There's a tricky conflict in the ncurses package definition between > >> master and core-updates. > >> > >> On core-updates, there is 57742b35dc026 (gnu: ncurses: Install > >> pkg-config ‘.pc’ files.), and on master, it's d230cf61f6a (gnu: ncurses: > >> support mingw.). > >> > >> The mingw commit added some conditionals relating to mingw, and I'm not > >> sure if the pkg-config change should be applied for mingw builds or not. > > > I think it can’t hurt MinGW cross-builds to keep the pkg-config change. > > Yes. > > > Your question was probably for Jan, no? > > I started doing a manual merge this morning and then forgot. I pushed > a manual merge of both commits to > > f55d1eff65ea -- https://gitlab.com/janneke/guix/tree/master
Thanks Jan! I used this resolve the conflict, and I updated the core-updates branch.
