xcbuild: 0.1.1 -> 0.1.2-pre

Also, add some static library stuff to the platform spec

+42 -19
+6 -6
pkgs/development/tools/xcbuild/default.nix
··· 16 16 }; 17 17 in stdenv.mkDerivation rec { 18 18 name = "xcbuild-${version}"; 19 - version = "0.1.1"; 19 + 20 + # Once a version is released that includes https://github.com/facebook/xcbuild/commit/183c087a6484ceaae860c6f7300caf50aea0d710, 21 + # we can stop doing this -pre thing. 22 + version = "0.1.2-pre"; 20 23 21 24 src = fetchFromGitHub { 22 25 owner = "facebook"; 23 26 repo = "xcbuild"; 24 - rev = version; 25 - sha256 = "0i98c6lii8r3bgs5gj7div12pxyzjvm4qqzmmzgr7dyhj00qa8r5"; 27 + rev = "32b9fbeb69bfa2682bd0351ec2f14548aaedd554"; 28 + sha256 = "1xxwg2849jizxv0g1hy0b1m3i7iivp9bmc4f5pi76swsn423d41m"; 26 29 }; 27 30 28 31 prePatch = '' ··· 30 33 cp -r --no-preserve=all ${googletest} ThirdParty/googletest 31 34 cp -r --no-preserve=all ${linenoise} ThirdParty/linenoise 32 35 ''; 33 - 34 - # See https://github.com/facebook/xcbuild/issues/238 and remove once that's in 35 - patches = [ ./return-false.patch ]; 36 36 37 37 # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. 38 38 postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+36
pkgs/development/tools/xcbuild/platform.nix
··· 102 102 }; 103 103 } 104 104 { 105 + Identifier = "com.apple.package-type.static-library"; 106 + Type = "PackageType"; 107 + Name = "Mach-O Static Library"; 108 + DefaultBuildSettings = { 109 + EXECUTABLE_PREFIX = "lib"; 110 + EXECUTABLE_SUFFIX = ".a"; 111 + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; 112 + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; 113 + }; 114 + ProductReference = { 115 + FileType = "archive.ar"; 116 + Name = "$(EXECUTABLE_NAME)"; 117 + IsLaunchable = "NO"; 118 + }; 119 + } 120 + { 105 121 Identifier = "com.apple.package-type.wrapper"; 106 122 Type = "PackageType"; 107 123 Name = "Wrapper"; ··· 172 188 Type = "ProductType"; 173 189 Name = "Dynamic Library"; 174 190 PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; 191 + } 192 + { 193 + Identifier = "com.apple.product-type.library.static"; 194 + Type = "ProductType"; 195 + Name = "Static Library"; 196 + PackageTypes = [ "com.apple.package-type.static-library" ]; 197 + DefaultBuildProperties = { 198 + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; 199 + MACH_O_TYPE = "staticlib"; 200 + REZ_EXECUTABLE = "YES"; 201 + EXECUTABLE_PREFIX = "lib"; 202 + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; 203 + EXECUTABLE_EXTENSION = "a"; 204 + FRAMEWORK_FLAG_PREFIX = "-framework"; 205 + LIBRARY_FLAG_PREFIX = "-l"; 206 + LIBRARY_FLAG_NOSPACE = "YES"; 207 + STRIP_STYLE = "debugging"; 208 + SEPARATE_STRIP = "YES"; 209 + CLANG_ENABLE_MODULE_DEBUGGING = "NO"; 210 + }; 175 211 } 176 212 { 177 213 Type = "ProductType";
-13
pkgs/development/tools/xcbuild/return-false.patch
··· 1 - diff --git a/Libraries/dependency/Tools/dependency-info-tool.cpp b/Libraries/dependency/Tools/dependency-info-tool.cpp 2 - index 006f53c7..d469f068 100644 3 - --- a/Libraries/dependency/Tools/dependency-info-tool.cpp 4 - +++ b/Libraries/dependency/Tools/dependency-info-tool.cpp 5 - @@ -271,7 +271,7 @@ main(int argc, char **argv) 6 - */ 7 - std::vector<uint8_t> makefileContents = std::vector<uint8_t>(contents.begin(), contents.end()); 8 - if (!filesystem.write(makefileContents, *options.output())) { 9 - - return false; 10 - + return -1; 11 - } 12 - 13 - return 0;