git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fix haddock when pkgconfig is needed to configure (#732)
47f0cdeHamish Mackenzie
builder/comp-builder.nix+1−1
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -200,7 +200,7 @@ let
200 inherit componentId component package flags commonConfigureFlags
200 inherit componentId component package flags commonConfigureFlags
201 commonAttrs revision setupGhcOptions doHaddock
201 commonAttrs revision setupGhcOptions doHaddock
202 doHoogle hyperlinkSource quickjump setupHaddockFlags
202 doHoogle hyperlinkSource quickjump setupHaddockFlags
203− needsProfiling configFiles preHaddock postHaddock;
203+ needsProfiling configFiles preHaddock postHaddock pkgconfig;
204
204
205 componentDrv = drv;
205 componentDrv = drv;
206 };
206 };
builder/haddock-builder.nix+10
@@ -8,6 +8,7 @@
8, commonAttrs
8, commonAttrs
9, preHaddock
9, preHaddock
10, postHaddock
10, postHaddock
11+, pkgconfig
11, commonConfigureFlags
12, commonConfigureFlags
12
13
13, doHaddock
14, doHaddock
@@ -72,6 +73,11 @@ let
72 outputs = ["out"]
73 outputs = ["out"]
73 ++ lib.optional doHaddock' "doc";
74 ++ lib.optional doHaddock' "doc";
74
75
76+ propagatedBuildInputs = builtins.concatLists pkgconfig;
77+
78+ buildInputs = component.libs
79+ ++ map (d: d.components.library.haddock or d) component.depends;
80+
75 nativeBuildInputs =
81 nativeBuildInputs =
76 [ shellWrappers buildPackages.removeReferencesTo ]
82 [ shellWrappers buildPackages.removeReferencesTo ]
77 ++ componentDrv.executableToolDepends;
83 ++ componentDrv.executableToolDepends;
@@ -89,6 +95,10 @@ let
89 runHook preHaddock
95 runHook preHaddock
90 # If we don't have any source files, no need to run haddock
96 # If we don't have any source files, no need to run haddock
91 [[ -n $(find . -name "*.hs" -o -name "*.lhs") ]] && {
97 [[ -n $(find . -name "*.hs" -o -name "*.lhs") ]] && {
98+ docdir="${docdir "$doc"}"
99+ # This mkdir needed for packages like bytestring-builder which
100+ # is empty when `bytestring >= 0.10.4`
101+ mkdir -p "$docdir"
92
102
93 $SETUP_HS haddock \
103 $SETUP_HS haddock \
94 "--html" \
104 "--html" \