64624ba · obelisk · git.iko.soy

git.iko.soy/obelisk

obelisk-executable-config: detect host and remove flags from cabal file

commit64624bab3167ae5e90560bdfd2f2dfa482496eca authorAli Abrar <aliabrar@gmail.com> dateThu 1 Mar 2018, 16:00 (9 years ago) parentcc3e1d6

2 files changed+4−27

compare with master

unifiedsplit

lib/executable-config/lookup/default.nix−8 lib/executable-config/lookup/obelisk-executable-config.cabal+4−19

lib/executable-config/lookup/default.nix−8

@@ -19,14 +19,6 @@ in mkDerivation {

1919 ghcjs-dom

2020 ] else [

2121 ]);

22− configureFlags = if isAndroid then [

23− "-fandroid"

24− ] else if isIOS then [

25− "-fios"

26− ] else if isGhcjs then [

27− "-fghcjs"

28− ] else [

29− ];

3022 license = stdenv.lib.licenses.bsd3;

3123}

3224

lib/executable-config/lookup/obelisk-executable-config.cabal+4−19

@@ -1,37 +1,22 @@

11name: obelisk-executable-config

2−version: 0.1

2+version: 0.1.1

33cabal-version: >= 1.2

44build-type: Simple

6−flag ios

7− description: Build for ios

8− default: False

9− manual: True

10−

11−flag android

12− description: Build for android

13− default: False

14− manual: True

15−

16−flag ghcjs

17− description: Build for ghcjs

18− default: False

19− manual: True

20−

216library

227 exposed-modules: Obelisk.ExecutableConfig

23− if flag(ios)

8+ if os(ios)

249 hs-source-dirs: src-ios

2510 build-depends: jsaddle-wkwebview

2611 else

27− if flag(android)

12+ if os(linux-android)

2813 hs-source-dirs: src-android

2914 c-sources: cbits/ExecutableConfig.c

3015 other-modules: Obelisk.ExecutableConfig.Internal.AssetManager

3116 build-depends: android-activity

3217 ld-options: -landroid

3318 else

34− if flag(ghcjs)

19+ if impl(ghcjs)

3520 hs-source-dirs: src-ghcjs

3621 build-depends: ghcjs-dom

3722 else