[x11] better x11 dependency handling