Make system identifier configurable (except for iphone targets)
Merge branch 'master' of github.com:NixOS/nixpkgs