diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:13:41 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-08-20 09:13:41 +0200 |
| commit | ae2cf7c00877a3dd778b3e3cabfec682503303d5 (patch) | |
| tree | 16c0b044abef442273e494420381770e6e2b45d5 /pkgs/development/tools/xcbuild/sdks.nix | |
| parent | 4ff7702082bad838e70140091afe7e77a9f00eca (diff) | |
| parent | 38eea804e6c02542085c9f232cdd699d96c95a23 (diff) | |
| download | nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.gz nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.bz2 nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.lz nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.xz nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.tar.zst nixlib-ae2cf7c00877a3dd778b3e3cabfec682503303d5.zip | |
Merge branch 'staging' into staging-next
There are security fixes for a few packages (and other changes).
Diffstat (limited to 'pkgs/development/tools/xcbuild/sdks.nix')
| -rw-r--r-- | pkgs/development/tools/xcbuild/sdks.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/tools/xcbuild/sdks.nix b/pkgs/development/tools/xcbuild/sdks.nix index b0af26e87c12..74192d9c6744 100644 --- a/pkgs/development/tools/xcbuild/sdks.nix +++ b/pkgs/development/tools/xcbuild/sdks.nix @@ -1,4 +1,5 @@ -{ runCommand, lib, toolchainName, sdkName, writeText, version, xcodePlatform }: +{ stdenv, runCommand, lib, toolchainName, sdkName +, writeText, version, xcodePlatform, libcxx, symlinkJoin }: let inherit (lib.generators) toPlist; @@ -18,11 +19,11 @@ let }; in -runCommand "SDKs" { - inherit version; -} '' +runCommand "SDKs" {} '' sdk=$out/${sdkName}.sdk install -D ${writeText "SDKSettings.plist" (toPlist {} SDKSettings)} $sdk/SDKSettings.plist install -D ${writeText "SystemVersion.plist" (toPlist {} SystemVersion)} $sdk/System/Library/CoreServices/SystemVersion.plist + ln -s $sdk $sdk/usr + ln -s $sdk $out/${xcodePlatform}.sdk '' |