Skip to content

Commit 28ee00b

Browse files
committed
Put the old default setup back for ghcjs
1 parent daf490b commit 28ee00b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

builder/hspkg-builder.nix

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ let
3636
setup = if package.buildType == "Simple"
3737
then
3838
if stdenv.targetPlatform.isGhcjs
39-
# Don't try to build default setup with DWARF enabled
40-
let defaultSetup = ghc.defaultSetupFor package.identifier.name // {
41-
dwarf = defaultSetup;
42-
}; in defaultSetup
43-
else
44-
buildPackages.haskell-nix.nix-tools-unchecked.exes.cabal // { isCabal = true; }
39+
then
40+
# Don't try to build default setup with DWARF enabled
41+
let defaultSetup = ghc.defaultSetupFor package.identifier.name // {
42+
dwarf = defaultSetup;
43+
}; in defaultSetup
44+
else
45+
buildPackages.haskell-nix.nix-tools-unchecked.exes.cabal // { isCabal = true; }
4546
else setup-builder ({
4647
component = components.setup // {
4748
depends = config.setup-depends ++ components.setup.depends ++ package.setup-depends;

0 commit comments

Comments
 (0)