3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #21185 from LnL7/darwin-xcbuild-meta

xcbuild: add meta
This commit is contained in:
Daniel Peebles 2016-12-15 12:12:43 -05:00 committed by GitHub
commit 774301ab0a
3 changed files with 13 additions and 4 deletions

View file

@ -41,4 +41,11 @@ in stdenv.mkDerivation rec {
buildInputs = [ cmake zlib libxml2 libpng ninja ] buildInputs = [ cmake zlib libxml2 libpng ninja ]
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
meta = with stdenv.lib; {
description = "Xcode-compatible build tool";
homepage = https://github.com/facebook/xcbuild;
platforms = platforms.unix;
maintainers = with maintainers; [ copumpkin matthewbauer ];
};
} }

View file

@ -19,10 +19,10 @@ let
# is removed because NixPkgs only supports darwin-x86_64. # is removed because NixPkgs only supports darwin-x86_64.
Architectures = [ Architectures = [
{ {
Identifier = "Standard"; Identifier = "Standard";
Type = "Architecture"; Type = "Architecture";
Name = "Standard Architectures (64-bit Intel)"; Name = "Standard Architectures (64-bit Intel)";
RealArchitectures = [ "x86_64" ]; RealArchitectures = [ "x86_64" ];
ArchitectureSetting = "ARCHS_STANDARD"; ArchitectureSetting = "ARCHS_STANDARD";
} }
{ {

View file

@ -64,6 +64,8 @@ stdenv.mkDerivation {
--set DEVELOPER_DIR "$out" --set DEVELOPER_DIR "$out"
''; '';
inherit (xcbuild) meta;
passthru = { passthru = {
raw = xcbuild; raw = xcbuild;
}; };