diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /pkgs/top-level/darwin-packages.nix | |
parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
download | nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.gz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.bz2 nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.lz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.xz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.zst nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.zip |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'pkgs/top-level/darwin-packages.nix')
-rw-r--r-- | pkgs/top-level/darwin-packages.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 907ec0c75924..a53b16919ee3 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -47,6 +47,7 @@ in iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs { buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk; targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs; + xcode = darwin.xcode_8_2; inherit (pkgs.llvmPackages) clang-unwrapped; }; @@ -68,7 +69,7 @@ in usr-include = callPackage ../os-specific/darwin/usr-include { }; - xcode = callPackage ../os-specific/darwin/xcode { }; + inherit (callPackages ../os-specific/darwin/xcode { } ) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2; CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { }; |