add support for newer cm build and pac man

Signed-off-by: Willi Ye <williye97@gmail.com>