[xorg-x11-drv-nvidia] fix build and clean up