public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #93596 from obsidiansystems/ios-13

Browse Source 
Support iOS 13 in cross
This commit is contained in:
Matthew Bauer 2020-09-10 23:24:47 -05:00 committed by GitHub
commit 9112a9d882
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 88 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/systems/examples.nix
View File

@ -179,8 +179,8 @@ rec {
iphone64 = { iphone64 = {
config = "aarch64-apple-ios"; config = "aarch64-apple-ios";
# config = "aarch64-apple-darwin14"; # config = "aarch64-apple-darwin14";
sdkVer = "12.4"; sdkVer = "13.2";
xcodeVer = "10.3"; xcodeVer = "11.3.1";
xcodePlatform = "iPhoneOS"; xcodePlatform = "iPhoneOS";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};
@ -189,8 +189,8 @@ rec {
iphone32 = { iphone32 = {
config = "armv7a-apple-ios"; config = "armv7a-apple-ios";
# config = "arm-apple-darwin10"; # config = "arm-apple-darwin10";
sdkVer = "12.4"; sdkVer = "13.2";
xcodeVer = "10.3"; xcodeVer = "11.3.1";
xcodePlatform = "iPhoneOS"; xcodePlatform = "iPhoneOS";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};
@ -199,8 +199,8 @@ rec {
iphone64-simulator = { iphone64-simulator = {
config = "x86_64-apple-ios"; config = "x86_64-apple-ios";
# config = "x86_64-apple-darwin14"; # config = "x86_64-apple-darwin14";
sdkVer = "12.4"; sdkVer = "13.2";
xcodeVer = "10.3"; xcodeVer = "11.3.1";
xcodePlatform = "iPhoneSimulator"; xcodePlatform = "iPhoneSimulator";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};
@ -209,8 +209,8 @@ rec {
iphone32-simulator = { iphone32-simulator = {
config = "i686-apple-ios"; config = "i686-apple-ios";
# config = "i386-apple-darwin11"; # config = "i386-apple-darwin11";
sdkVer = "12.4"; sdkVer = "13.2";
xcodeVer = "10.3"; xcodeVer = "11.3.1";
xcodePlatform = "iPhoneSimulator"; xcodePlatform = "iPhoneSimulator";
useiOSPrebuilt = true; useiOSPrebuilt = true;
platform = {}; platform = {};

144
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -17,92 +17,90 @@ in
# Non-Darwin alternatives # Non-Darwin alternatives
assert (!stdenv.hostPlatform.isDarwin) -> maloader != null; assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
let stdenv.mkDerivation {
baseParams = rec { pname = "${targetPrefix}cctools-port";
name = "${targetPrefix}cctools-port"; version = "949.0.1";
version = "927.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpoechtrager"; owner = "tpoechtrager";
repo = "cctools-port"; repo = "cctools-port";
rev = "8239a5211bcf07d6b9d359782e1a889ec1d7cce5"; rev = "43f32a4c61b5ba7fde011e816136c550b1b3146f";
sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac"; sha256 = "10yc5smiczzm62q6ijqccc58bwmfhc897f3bwa5i9j98csqsjj0k";
}; };
outputs = [ "out" "dev" "man" ]; outputs = [ "out" "dev" "man" ];
nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ];
buildInputs = [ libuuid ] buildInputs = [ libuuid ]
++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
++ stdenv.lib.optional enableTapiSupport libtapi; ++ stdenv.lib.optional enableTapiSupport libtapi;
patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ]; patches = [ ./ld-ignore-rpath-link.patch ./ld-rpath-nonfinal.patch ];
__propagatedImpureHostDeps = [ __propagatedImpureHostDeps = [
# As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
"/usr/lib/libobjc.A.dylib" "/usr/lib/libobjc.A.dylib"
"/usr/lib/libobjc.dylib" "/usr/lib/libobjc.dylib"
];
enableParallelBuilding = true;
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
configurePlatforms = [ "build" "host" ]
++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
configureFlags = [ "--disable-clang-as" ]
++ stdenv.lib.optionals enableTapiSupport [
"--enable-tapi-support"
"--with-libtapi=${libtapi}"
]; ];
enableParallelBuilding = true; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace cctools/Makefile.am --replace libobjc2 ""
'' + ''
sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
# TODO(@Ericson2314): Always pass "--target" and always targetPrefix. # FIXME: there are far more absolute path references that I don't want to fix right now
configurePlatforms = [ "build" "host" ] substituteInPlace cctools/configure.ac \
++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target"; --replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
configureFlags = [ "--disable-clang-as" ] --replace "-L/usr/local/lib" "" \
++ stdenv.lib.optionals enableTapiSupport [
"--enable-tapi-support"
"--with-libtapi=${libtapi}"
];
postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace cctools/include/Makefile \
substituteInPlace cctools/Makefile.am --replace libobjc2 "" --replace "/bin/" ""
'' + ''
sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
# FIXME: there are far more absolute path references that I don't want to fix right now patchShebangs tools
substituteInPlace cctools/configure.ac \ sed -i -e 's/which/type -P/' tools/*.sh
--replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
--replace "-L/usr/local/lib" "" \
substituteInPlace cctools/include/Makefile \ # Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157
--replace "/bin/" "" cat > cctools/include/unistd.h <<EOF
#ifdef __block
# undef __block
# include_next "unistd.h"
# define __block __attribute__((__blocks__(byref)))
#else
# include_next "unistd.h"
#endif
EOF
patchShebangs tools cd cctools
sed -i -e 's/which/type -P/' tools/*.sh '';
# Workaround for https://www.sourceware.org/bugzilla/show_bug.cgi?id=11157 preInstall = ''
cat > cctools/include/unistd.h <<EOF pushd include
#ifdef __block make DSTROOT=$out/include RC_OS=common install
# undef __block popd
# include_next "unistd.h"
# define __block __attribute__((__blocks__(byref)))
#else
# include_next "unistd.h"
#endif
EOF
cd cctools installManPage ar/ar.{1,5}
''; '';
preInstall = '' passthru = {
pushd include inherit targetPrefix;
make DSTROOT=$out/include RC_OS=common install
popd
installManPage ar/ar.{1,5}
'';
passthru = {
inherit targetPrefix;
};
meta = {
broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
homepage = "http://www.opensource.apple.com/source/cctools/";
description = "MacOS Compiler Tools (cross-platform port)";
license = stdenv.lib.licenses.apsl20;
maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
};
}; };
in stdenv.mkDerivation baseParams
meta = {
broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
homepage = "http://www.opensource.apple.com/source/cctools/";
description = "MacOS Compiler Tools (cross-platform port)";
license = stdenv.lib.licenses.apsl20;
maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
};
}

4
pkgs/os-specific/darwin/libtapi/default.nix
View File

@ -5,8 +5,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "tpoechtrager"; owner = "tpoechtrager";
repo = "apple-libtapi"; repo = "apple-libtapi";
rev = "cd9885b97fdff92cc41e886bba4a404c42fdf71b"; rev = "3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48";
sha256 = "1a19h39a48agvnmal99n9j1fjadiqwib7hfzmn342wmgh9z3vk0g"; sha256 = "1zb10p6xkls8x7wsdwgy9c0v16z97rfkgidii9ffq5rfczgvrhjh";
}; };
sourceRoot = "source/src/llvm"; sourceRoot = "source/src/llvm";

3
pkgs/os-specific/darwin/xcode/default.nix
View File

@ -53,5 +53,6 @@ in lib.makeExtensible (self: {
xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg"; xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg";
xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb"; xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb";
xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh"; xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "10.3")}"; xcode_11_3_1 = requireXcode "11.3.1" "1p6nicj91kr6ad3rmycahd1i7z4hj7ccjs93ixsiximjzaahx3q4";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if (stdenv.targetPlatform ? xcodeVer) then stdenv.targetPlatform.xcodeVer else "11.3.1")}";
}) })

6
pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
View File

@ -12,7 +12,7 @@
let let
minSdkVersion = "9.0"; minSdkVersion = targetPlatform.minSdkVersion or "9.0";
iosPlatformArch = { parsed, ... }: { iosPlatformArch = { parsed, ... }: {
armv7a = "armv7"; armv7a = "armv7";
@ -37,6 +37,10 @@ rec {
bintools = binutils-unwrapped; bintools = binutils-unwrapped;
extraBuildCommands = '' extraBuildCommands = ''
echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags echo "-arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/libc-ldflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") ''
echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags
''; '';
}; };