Merge pull request #30338 from copumpkin/xcbuild-fixes

darwin: fix assorted xcbuild builds
This commit is contained in:
Daniel Peebles
2017-10-12 07:22:10 -04:00
committed by GitHub
6 changed files with 75 additions and 13 deletions

View File

@@ -188,6 +188,22 @@ let
Type = "ProductType";
Name = "Dynamic Library";
PackageTypes = [ "com.apple.package-type.mach-o-dylib" ];
DefaultBuildProperties = {
FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)";
MACH_O_TYPE = "mh_dylib";
REZ_EXECUTABLE = "YES";
EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)";
EXECUTABLE_EXTENSION = "dylib";
DYLIB_COMPATIBILITY_VERSION = "1";
DYLIB_CURRENT_VERSION = "1";
FRAMEWORK_FLAG_PREFIX = "-framework";
LIBRARY_FLAG_PREFIX = "-l";
LIBRARY_FLAG_NOSPACE = "YES";
STRIP_STYLE = "debugging";
GCC_INLINES_ARE_PRIVATE_EXTERN = "YES";
CODE_SIGNING_ALLOWED = "YES";
CODE_SIGNING_REQUIRED = "NO";
};
}
{
Identifier = "com.apple.product-type.library.static";
@@ -247,7 +263,7 @@ let
in
stdenv.mkDerivation {
name = "nixpkgs.platform";
name = "MacOSX.platform";
buildInputs = [ xcbuild ];
buildCommand = ''
mkdir -p $out/
@@ -264,6 +280,6 @@ stdenv.mkDerivation {
mkdir -p $out/Developer/SDKs/
cd $out/Developer/SDKs/
cp -r ${sdk} nix.nixpkgs.sdk
cp -r ${sdk} ${sdk.name}
'';
}

View File

@@ -19,7 +19,7 @@ let
in
stdenv.mkDerivation {
name = "nix.nixpkgs.sdk";
name = "MacOSX.sdk";
buildInputs = [ xcbuild ];
buildCommand = ''
mkdir -p $out/