diff options
author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-06-25 21:59:01 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-25 21:59:01 -0400 |
commit | c16eb044257d10f979d9cd332eb979872471589e (patch) | |
tree | c66d84e0d8a35b95785de3212bedb26a9df549de /pkgs | |
parent | b385d0469777f77907d365b61c0ef4a51769136e (diff) | |
parent | 9b0b31d9813220de53e950d0f207a3b874dc0780 (diff) | |
download | nixlib-c16eb044257d10f979d9cd332eb979872471589e.tar nixlib-c16eb044257d10f979d9cd332eb979872471589e.tar.gz nixlib-c16eb044257d10f979d9cd332eb979872471589e.tar.bz2 nixlib-c16eb044257d10f979d9cd332eb979872471589e.tar.lz nixlib-c16eb044257d10f979d9cd332eb979872471589e.tar.xz nixlib-c16eb044257d10f979d9cd332eb979872471589e.tar.zst nixlib-c16eb044257d10f979d9cd332eb979872471589e.zip |
Merge pull request #42399 from obsidiansystems/xcodever-in-system
xcode: add xcodeVer to system
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/darwin/xcode/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/darwin-packages.nix | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index d153ef16c14e..252fe5abf49f 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile }: +{ stdenv, requireFile, targetPlatform, lib }: let requireXcode = version: sha256: let @@ -40,11 +40,11 @@ let requireXcode = version: sha256: in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; }); -in rec { +in lib.makeExtensible (self: { xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n"; xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2"; xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic"; xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c"; xcode_9_4 = requireXcode "9.4" "6731381785075602a52489f7ea47ece8f6daf225007ba3ffae1fd59b1c0b5f01"; - xcode = xcode_9_4; -} + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if targetPlatform.useiOSPrebuilt then targetPlatform.xcodeVer else "9.4")}"; +}) diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index a1d5772fe6da..03a32260710a 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -47,7 +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; + xcode = darwin.xcode; inherit (pkgs.llvmPackages) clang-unwrapped; }; |