git.iko.soy/jsaddle
on master help sign in
Fix for jsaddle-warp on linux
b06fdb0Hamish Mackenzie
jsaddle-warp/default.nix+7−4
compare with master
unifiedsplit
@@ -2,7 +2,7 @@
2, doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive
2, doctest, filepath, ghc-prim, http-types, jsaddle, lens, primitive
3, process, QuickCheck, ref-tf, stdenv, stm, text, time
3, process, QuickCheck, ref-tf, stdenv, stm, text, time
4, transformers, wai, wai-websockets, warp, websockets, osx_sdk
4, transformers, wai, wai-websockets, warp, websockets, osx_sdk
5−, darwin, webdriver, phantomjs
5+, darwin, webdriver, phantomjs, ghc
6}:
6}:
7mkDerivation {
7mkDerivation {
8 pname = "jsaddle-warp";
8 pname = "jsaddle-warp";
@@ -10,9 +10,12 @@ mkDerivation {
10 src = ./.;
10 src = ./.;
11 libraryHaskellDepends = [
11 libraryHaskellDepends = [
12 aeson base containers http-types jsaddle stm text time transformers
12 aeson base containers http-types jsaddle stm text time transformers
13− wai wai-websockets warp websockets osx_sdk darwin.libobjc
13+ wai wai-websockets warp websockets
14+ ] ++ (if ghc.isGhcjs or false then [
15+ ] else if stdenv.isDarwin then [
14− darwin.apple_sdk.libs.xpc
16+# osx_sdk darwin.libobjc darwin.apple_sdk.libs.xpc
17+ ] else [
15− ];
18+ ]);
16 testHaskellDepends = [
19 testHaskellDepends = [
17 base bytestring deepseq doctest filepath ghc-prim jsaddle lens
20 base bytestring deepseq doctest filepath ghc-prim jsaddle lens
18 primitive process QuickCheck ref-tf webdriver phantomjs
21 primitive process QuickCheck ref-tf webdriver phantomjs