diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-28 11:11:19 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-28 11:11:19 -0400 |
commit | d361371d236c90bfb550e827124b5350deeadbda (patch) | |
tree | c4489ead44d1819064c481afe8275f49d5e2bad1 /pkgs/development/tools/xcbuild | |
parent | 161414063fa9a87b61e5460c61ab1125c9e68e55 (diff) | |
download | nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.tar nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.tar.gz nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.tar.bz2 nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.tar.lz nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.tar.xz nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.tar.zst nixpkgs-d361371d236c90bfb550e827124b5350deeadbda.zip |
generators: refactor toPLIST
Diffstat (limited to 'pkgs/development/tools/xcbuild')
-rw-r--r-- | pkgs/development/tools/xcbuild/platform.nix | 10 | ||||
-rw-r--r-- | pkgs/development/tools/xcbuild/sdk.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/xcbuild/toolchain.nix | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index e3fb83edc67..502c3bcdbc8 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -286,11 +286,11 @@ let in runCommand "MacOSX.platform" {} '' - install -D ${writeText "Info.plist" (toPLIST Info)} $out/Info.plist - install -D ${writeText "version.plist" (toPLIST Version)} $out/version.plist - install -D ${writeText "Architectures.xcspec" (toPLIST Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec - install -D ${writeText "PackageTypes.xcspec" (toPLIST PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec - install -D ${writeText "ProductTypes.xcspec" (toPLIST ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec + install -D ${writeText "Info.plist" (toPLIST {} Info)} $out/Info.plist + install -D ${writeText "version.plist" (toPLIST {} Version)} $out/version.plist + install -D ${writeText "Architectures.xcspec" (toPLIST {} Architectures)} $out/Developer/Library/Xcode/Specifications/Architectures.xcspec + install -D ${writeText "PackageTypes.xcspec" (toPLIST {} PackageTypes)} $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec + install -D ${writeText "ProductTypes.xcspec" (toPLIST {} ProductTypes)} $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 2d43347da03..5fdfe587722 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -24,6 +24,6 @@ in runCommand "MacOSX${version}.sdk" { inherit version; } '' - install -D ${writeText "SDKSettings.plist" (toPLIST SDKSettings)} $out/SDKSettings.plist - install -D ${writeText "SystemVersion.plist" (toPLIST SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist + install -D ${writeText "SDKSettings.plist" (toPLIST {} SDKSettings)} $out/SDKSettings.plist + install -D ${writeText "SystemVersion.plist" (toPLIST {} SystemVersion)} $out/System/Library/CoreServices/SystemVersion.plist '' diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index d8c80b53831..ed5730abddf 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -24,7 +24,7 @@ runCommand "nixpkgs.xctoolchain" { nativeBuildInputs = [ makeWrapper ]; } ('' mkdir -p $out - install -D ${writeText "ToolchainInfo.plist" (toPLIST ToolchainInfo)} $out/ToolchainInfo.plist + install -D ${writeText "ToolchainInfo.plist" (toPLIST {} ToolchainInfo)} $out/ToolchainInfo.plist mkdir -p $out/usr/include mkdir -p $out/usr/lib |