mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
xcbuild: 0ab861ab -> 0.1.1 (#21895)
* xcbuild: add xcode-select wrapper * xcbuild: update to 0.1.1
This commit is contained in:
parent
003ae42ae6
commit
10cfe945fe
@ -15,14 +15,14 @@ let
|
||||
sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w";
|
||||
};
|
||||
in stdenv.mkDerivation rec {
|
||||
name = "xcbuild-${stdenv.lib.substring 0 8 version}";
|
||||
version = "0ab861abcc11185a17d59608f96a015752a6fadc";
|
||||
name = "xcbuild-${version}";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "xcbuild";
|
||||
rev = version;
|
||||
sha256 = "12h0rn8v0js2vph2pwp5wvcrfkj12nz365i5qxw9miyfn4msnz26";
|
||||
sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
@ -39,6 +39,8 @@ in stdenv.mkDerivation rec {
|
||||
rmdir $out/usr
|
||||
'';
|
||||
|
||||
NIX_CFLAGS_COMPILE = "-Wno-error=strict-aliasing";
|
||||
|
||||
buildInputs = [ cmake zlib libxml2 libpng ninja ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ];
|
||||
|
||||
|
@ -60,7 +60,8 @@ stdenv.mkDerivation {
|
||||
--add-flags "DERIVED_DATA_DIR=." \
|
||||
--set DEVELOPER_DIR "$out"
|
||||
wrapProgram $out/bin/xcrun \
|
||||
--add-flags "-sdk ${sdkName}" \
|
||||
--set DEVELOPER_DIR "$out"
|
||||
wrapProgram $out/bin/xcode-select \
|
||||
--set DEVELOPER_DIR "$out"
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user