Merge pull request #3 from gridaphobe/new-darwin

Fix a bunch of packages on darwin