diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-28 11:12:39 -0400 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-06-28 15:24:12 -0400 |
commit | 337b58950b9f945933eb82b46c9c4ceb1af3f997 (patch) | |
tree | 937e217c417d2ea89df557f7ec3cbfcfb5e1c431 /pkgs/development/tools/xcbuild | |
parent | d361371d236c90bfb550e827124b5350deeadbda (diff) | |
download | nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.tar nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.tar.gz nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.tar.bz2 nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.tar.lz nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.tar.xz nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.tar.zst nixpkgs-337b58950b9f945933eb82b46c9c4ceb1af3f997.zip |
generators: refactor toPlist
Address PR comments Refactors - Rename toPLIST -> toPlist
Diffstat (limited to 'pkgs/development/tools/xcbuild')
-rw-r--r-- | pkgs/development/tools/xcbuild/platform.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/xcbuild/sdk.nix | 6 | ||||
-rw-r--r-- | pkgs/development/tools/xcbuild/toolchain.nix | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 502c3bcdbc8..bb91df474aa 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -2,7 +2,7 @@ let - inherit (lib.generators) toPLIST; + inherit (lib.generators) toPlist; Info = { CFBundleIdentifier = platformName; @@ -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 5fdfe587722..c97d17d739b 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -1,7 +1,7 @@ { runCommand, lib, toolchainName, sdkName, writeText }: let - inherit (lib.generators) toPLIST; + inherit (lib.generators) toPlist; # TODO: expose MACOSX_DEPLOYMENT_TARGET in nix so we can use it here. version = "10.10"; @@ -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 ed5730abddf..51bc5d60bcf 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -4,7 +4,7 @@ let inherit (lib) getBin optionalString; - inherit (lib.generators) toPLIST; + inherit (lib.generators) toPlist; ToolchainInfo = { Identifier = toolchainName; @@ -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 |