diff options
| author | Artturin <Artturin@artturin.com> | 2023-01-09 05:36:01 +0200 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2023-01-09 21:13:22 +0200 |
| commit | 2eeb34c2737f5eb8a2796701584a7b0551cb053a (patch) | |
| tree | bbd2d01a65ae344e46a8c91537f6a0f00257d410 /pkgs/os-specific/darwin/xcode | |
| parent | ecab3edeb79a5257974d24acd04e5c9b3c245e6c (diff) | |
| download | nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.gz nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.bz2 nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.lz nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.xz nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.tar.zst nixpkgs-2eeb34c2737f5eb8a2796701584a7b0551cb053a.zip | |
treewide: {build,host,target}Platform -> stdenv.{build,host,target}Platform
Diffstat (limited to 'pkgs/os-specific/darwin/xcode')
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 2ce607896b5..6d1929ef982 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -1,10 +1,10 @@ -{ buildPlatform, requireFile, targetPlatform, lib }: +{ stdenv, requireFile, lib }: let requireXcode = version: sha256: let xip = "Xcode_" + version + ".xip"; # TODO(alexfmpe): Find out how to validate the .xip signature in Linux - unxip = if buildPlatform.isDarwin + unxip = if stdenv.buildPlatform.isDarwin then '' open -W ${xip} rm -rf ${xip} @@ -66,6 +66,6 @@ in lib.makeExtensible (self: { xcode_12_1 = requireXcode "12.1" "1widy74dk43wx8iqgd7arzf6q4kzdmaz8pfwymzs8chnq9dqr3wp"; xcode_12_2 = requireXcode "12.2" "17i0wf4pwrxwfgjw7rpw9mcd59nkmys1k5h2rqsw81snzyxy9j0v"; xcode_12_3 = requireXcode "12.3" "0kwf1y4llysf1p0nsbqyzccn7d77my0ldagr5fi3by4k0xy3d189"; - xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (targetPlatform ? xcodeVer) then targetPlatform.xcodeVer else "12.3")}"; + xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "12.3")}"; }) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index 0512d9dd46a..50eb50ea6b7 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -1,4 +1,4 @@ -{ targetPlatform +{ stdenv , clang-unwrapped , binutils-unwrapped , runCommand @@ -12,7 +12,7 @@ let -minSdkVersion = targetPlatform.minSdkVersion or "9.0"; +minSdkVersion = stdenv.targetPlatform.minSdkVersion or "9.0"; in @@ -22,8 +22,8 @@ rec { type = "derivation"; outPath = xcode + "/Contents/Developer/Platforms/${platform}.platform/Developer/SDKs/${platform}${version}.sdk"; - platform = targetPlatform.xcodePlatform; - version = targetPlatform.sdkVer; + platform = stdenv.targetPlatform.xcodePlatform; + version = stdenv.targetPlatform.sdkVer; }; binutils = wrapBintoolsWith { @@ -39,7 +39,7 @@ rec { extraBuildCommands = '' tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp mv cc-cflags.tmp $out/nix-support/cc-cflags - echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags + echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags ${lib.optionalString (lib.versionAtLeast sdk.version "14") "echo -isystem ${xcode}/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1 >> $out/nix-support/cc-cflags"} ''; |