From 5ee488c640857e9955df128dfd8e157c9ba0c373 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Jun 2018 12:20:47 -0400 Subject: [PATCH 1/2] Fix jsaddle-wkwebview iOS SDK We need to use xcode_8_2 here from Nixpkgs. The long path is unfortunate but probably inevitable until someone defines an "iOS sdk" derivation for Nixpkgs. --- jsaddle-wkwebview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsaddle-wkwebview/default.nix b/jsaddle-wkwebview/default.nix index f1cf1e54..03cb487a 100644 --- a/jsaddle-wkwebview/default.nix +++ b/jsaddle-wkwebview/default.nix @@ -7,8 +7,8 @@ mkDerivation { version = "0.9.4.0"; src = ./.; libraryHaskellDepends = [ aeson base bytestring jsaddle data-default ]; - libraryFrameworkDepends = with buildPackages; if hostPlatform.useiOSCross or false then [ - (assert osx_sdk != null; osx_sdk) + libraryFrameworkDepends = with buildPackages; if hostPlatform.useiOSPrebuilt then [ + "${darwin.xcode_8_2}/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System" ] else [ darwin.libobjc darwin.apple_sdk.libs.xpc From b72f3b8bdbfa26fd5ad9e42446b946919f105ed9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 15 Jun 2018 17:20:45 -0400 Subject: [PATCH 2/2] Fix cflags in jsaddle-wkwebview --- jsaddle-wkwebview/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jsaddle-wkwebview/default.nix b/jsaddle-wkwebview/default.nix index 03cb487a..1db94ce1 100644 --- a/jsaddle-wkwebview/default.nix +++ b/jsaddle-wkwebview/default.nix @@ -7,6 +7,14 @@ mkDerivation { version = "0.9.4.0"; src = ./.; libraryHaskellDepends = [ aeson base bytestring jsaddle data-default ]; + + # HACK(matthewbauer): Make sure framework is pulled in first so that + # CoreFoundation is correct. Eventually we will update + # CoreFoundation in Nixpkgs but that has caused some other issues. + preBuild = stdenv.lib.optionalString hostPlatform.useiOSPrebuilt '' + NIX_CFLAGS_COMPILE="-F${buildPackages.darwin.xcode_8_2}/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System/Library/Frameworks" + ''; + libraryFrameworkDepends = with buildPackages; if hostPlatform.useiOSPrebuilt then [ "${darwin.xcode_8_2}/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/System" ] else [