cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

xcode: don’t use libstdc++ on iOS

Browse source 
Apple no longer ships with it, so best to avoid forcing it into use.
This commit is contained in:
Matthew Bauer 2019-11-25 23:50:21 -05:00
parent 28c37155d7
commit 3432b1baa8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
View file

@ -7,6 +7,7 @@
, wrapCCWith , wrapCCWith
, buildIosSdk, targetIosSdkPkgs , buildIosSdk, targetIosSdkPkgs
, xcode , xcode
, lib
}: }:
let let
@ -48,7 +49,7 @@ rec {
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags mv cc-cflags.tmp $out/nix-support/cc-cflags
echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") '' '' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") '' '' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") ''