git.iko.soy/jsaddle
on master help sign in
Merge pull request #19 from ghcjs/jsaddle-nix-fix

Fix the build on nixpkgs

commit4aa7ad6ca646849acf564e5c853b44e2d8118d9e authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateSat 6 May 2017, 02:31 (9 years ago) parent5c239aec9e2df1
2 files changed+9−3
compare with master
unifiedsplit
jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+1−1 jsaddle-wkwebview/default.nix+8−2
jsaddle-wkwebview/cbits-cocoa/AppDelegate.m+1−1
@@ -34,7 +34,7 @@ extern void withWebView(WKWebView *, HsStablePtr);
3434-(void)applicationWillFinishLaunching:(NSNotification *)notification {
3535 WKWebViewConfiguration *theConfiguration = [[WKWebViewConfiguration alloc] init];
3636 [theConfiguration.preferences setValue:@YES forKey:@"developerExtrasEnabled"];
37− WKWebView *webView = [[WKWebView alloc] initWithFrame:_window.contentView.frame configuration:theConfiguration];
37+ WKWebView *webView = [[WKWebView alloc] initWithFrame: [_window.contentView frame] configuration:theConfiguration];
3838 [_window setContentView:webView];
3939 withWebView(webView, _handler);
4040}
jsaddle-wkwebview/default.nix+8−2
@@ -4,11 +4,17 @@
44
55mkDerivation {
66 pname = "jsaddle-wkwebview";
7− version = "0.8.2.0";
7+ version = "0.8.3.2";
88 src = ./.;
99 libraryHaskellDepends = [ aeson base bytestring jsaddle ]
1010 # should use `librarySystemDepends` but it is not propagated
11− ++ (with buildPackages; [ osx_sdk darwin.libobjc darwin.apple_sdk.libs.xpc ]);
11+ ++ (with buildPackages; [
12+ darwin.libobjc
13+ darwin.apple_sdk.libs.xpc
14+ darwin.apple_sdk.frameworks.Foundation
15+ darwin.apple_sdk.frameworks.Cocoa
16+ darwin.apple_sdk.frameworks.WebKit
17+ ]);
1218 description = "Interface for JavaScript that works with GHCJS and GHC";
1319 license = stdenv.lib.licenses.mit;
1420}