Skip to content

Commit 82cda52

Browse files
committed
Remove special treatment of ghc dependency in custom setup
1 parent 51737c7 commit 82cda52

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

builder/setup-builder.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ let
1919

2020
fullName = "${name}-setup";
2121

22-
includeGhcPackage = lib.any (p: p.identifier.name == "ghc") component.depends;
23-
2422
configFiles = makeSetupConfigFiles {
2523
inherit (package) identifier;
2624
inherit fullName flags component enableDWARF nonReinstallablePkgs;
@@ -80,8 +78,7 @@ let
8078
for f in Setup.hs Setup.lhs; do
8179
if [ -f $f ]; then
8280
echo Compiling package $f
83-
ghc $f -threaded ${if includeGhcPackage then "-package ghc " else ""
84-
}-package-env $configFiles/ghc-environment --make -o ./Setup
81+
ghc $f -threaded -package-env $configFiles/ghc-environment --make -o ./Setup
8582
fi
8683
done
8784
[ -f ./Setup ] || (echo Failed to build Setup && exit 1)

0 commit comments

Comments
 (0)