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