cmake removal on nix/mac
merge