Add osx and rpi options