diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-10-11 21:31:59 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-10-12 07:16:22 -0400 |
| commit | e86991e1e81f882d79abc32dcd8c797fceec5548 (patch) | |
| tree | 35595c733321acec984ee8ebf118affa59f14427 /pkgs/development/tools | |
| parent | dd53e65e2e0ec8f2637ef381272905395ec72836 (diff) | |
| download | nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.gz nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.bz2 nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.lz nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.xz nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.tar.zst nixlib-e86991e1e81f882d79abc32dcd8c797fceec5548.zip | |
darwin: fix assorted xcbuild builds
This includes adding a new xcbuild-based libutil build to test the waters a bit there. We'll need to get xcbuild into the stdenv bootstrap before we can make the main build, but it's nice to see that it can work.
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/xcbuild/platform.nix | 20 | ||||
| -rw-r--r-- | pkgs/development/tools/xcbuild/sdk.nix | 2 |
2 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 2705d703b716..d0836daf6135 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -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} ''; } diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 7d587249bf8e..169fd5f6ec66 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -19,7 +19,7 @@ let in stdenv.mkDerivation { - name = "nix.nixpkgs.sdk"; + name = "MacOSX.sdk"; buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ |