public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

generators: refactor toPlist

Browse Source 
Address PR comments

Refactors

- Rename toPLIST -> toPlist
This commit is contained in:
Matthew Bauer
2018-06-28 11:12:39 -04:00
parent d361371d23
commit 337b58950b
4 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/xcbuild/platform.nix
View File

@@ -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/

6
pkgs/development/tools/xcbuild/sdk.nix
View File

@@ -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
''

4
pkgs/development/tools/xcbuild/toolchain.nix
View File

@@ -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