Merge pull request #332 from kmicklas/remove-android-cabal-flag
Replace Android cabal flag with OS selector which works since nixpkgs 19.03
commitce85b1614a1e8988c40124e10bb37fb9dfde4084
authorAli Abrar <aliabrar@gmail.com>
dateTue 15 Oct 2019, 10:50 (7 years ago)
parent419dc173022f09
reflex-dom/default.nix+1−3
@@ -27,9 +27,7 @@ in mkDerivation {
2727 ] else [
2828 ghcBackendPackage
2929 ]);
30− configureFlags = if isAndroid then [
31− "-fandroid"
32− ] else if ghcBackend == "warp" then [
30+ configureFlags = if ghcBackend == "warp" then [
3331 "-fuse-warp"
3432 ] else [
3533 ];
reflex-dom/reflex-dom.cabal+2−7
@@ -41,14 +41,9 @@ flag build-examples
4141 default: False
4242 manual: True
4343
44−flag android
45− description: Build an Android app
46− default: False
47− manual: True
48−
4944library
5045 hs-source-dirs: src
51− if flag(android)
46+ if os(android)
5247 hs-source-dirs: src-android
5348 other-modules: Reflex.Dom.Android.MainWidget
5449 build-depends:
@@ -83,7 +78,7 @@ library
8378 build-depends:
8479 jsaddle-webkit2gtk
8580 else
86− if !flag(android)
81+ if !os(android)
8782 build-depends:
8883 jsaddle-webkit2gtk
8984