git.iko.soy/reflex-dom
on develop help sign in
Merge pull request #332 from kmicklas/remove-android-cabal-flag
ce85b16Ali Abrar
reflex-dom/default.nix+1−3
compare with develop
unifiedsplit
@@ -27,9 +27,7 @@ in mkDerivation {
27 ] else [
27 ] else [
28 ghcBackendPackage
28 ghcBackendPackage
29 ]);
29 ]);
30− configureFlags = if isAndroid then [
31− "-fandroid"
32− ] else if ghcBackend == "warp" then [
30+ configureFlags = if ghcBackend == "warp" then [
33 "-fuse-warp"
31 "-fuse-warp"
34 ] else [
32 ] else [
35 ];
33 ];
reflex-dom/reflex-dom.cabal+2−7
@@ -41,14 +41,9 @@ flag build-examples
41 default: False
41 default: False
42 manual: True
42 manual: True
43
43
44−flag android
45− description: Build an Android app
46− default: False
47− manual: True
48−
49library
44library
50 hs-source-dirs: src
45 hs-source-dirs: src
51− if flag(android)
46+ if os(android)
52 hs-source-dirs: src-android
47 hs-source-dirs: src-android
53 other-modules: Reflex.Dom.Android.MainWidget
48 other-modules: Reflex.Dom.Android.MainWidget
54 build-depends:
49 build-depends:
@@ -83,7 +78,7 @@ library
83 build-depends:
78 build-depends:
84 jsaddle-webkit2gtk
79 jsaddle-webkit2gtk
85 else
80 else
86− if !flag(android)
81+ if !os(android)
87 build-depends:
82 build-depends:
88 jsaddle-webkit2gtk
83 jsaddle-webkit2gtk
89
84