Merge remote-tracking branch 'origin/master' into aa-deploy-mkserver
* origin/master:
skeleton: fix frontend deps
commita4b773af8adf350330691fb80ecc018dabc061d6
authorAli Abrar <aliabrar@gmail.com>
dateWed 9 May 2018, 15:52 (8 years ago)
parent15d7f0efdca0f7
default.nix+1
@@ -186,6 +186,7 @@ rec {
186186 combinedPackages = predefinedPackages // packages;
187187 projectOverrides = self: super: {
188188 ${staticName} = dontHaddock (self.callCabal2nix "static" assets.haskellManifest {});
189+ frontend = if self.ghc.isGhcjs then super.frontend.override { obelisk-run-frontend = null; } else super.frontend;
189190 };
190191 totalOverrides = composeExtensions (composeExtensions defaultHaskellOverrides projectOverrides) overrides;
191192 ghcDevPackages = ["obelisk-run-frontend"];