git.iko.soy/obelisk
on master help sign in
executable-config-lookup: Provide android-activity dependency when necessary
daee8ca3noch
lib/executable-config/default.nix+13−2
compare with master
unifiedsplit
@@ -25,8 +25,19 @@ let
25in
25in
26
26
27{
27{
28− haskellOverlay = self: super: {
28+ haskellOverlay = self: super:
29+ let
30+ pkgs = self.callPackage ({pkgs}: pkgs) {};
31+ in {
32+ obelisk-executable-config-lookup = pkgs.haskell.lib.overrideCabal
29− obelisk-executable-config-lookup = self.callCabal2nix "obelisk-executable-config-lookup" (obeliskCleanSource ./lookup) {};
33+ (self.callCabal2nix "obelisk-executable-config-lookup" (obeliskCleanSource ./lookup) {})
34+ (drv: {
35+ # Hack until https://github.com/NixOS/cabal2nix/pull/432 lands
36+ libraryHaskellDepends = (drv.libraryHaskellDepends or [])
37+ ++ pkgs.stdenv.lib.optionals (with pkgs.stdenv.hostPlatform; isAndroid && is32bit) [
38+ self.android-activity
39+ ];
40+ });
30 };
41 };
31
42
32 platforms = {
43 platforms = {