on iko/ghcjs-patch-master help sign in
Use internal-nix-tools for hpack (#816)
commite340658306cea5817f5478ad4ad8ba4f7da2381f authorHamish Mackenzie <Hamish.Mackenzie@iohk.io> dateWed 12 Aug 2020, 21:40 (6 years ago) parent5bdfe10
1 file changed+6−3
builder/comp-builder.nix+6−3
builder/comp-builder.nix+6−3
@@ -174,9 +174,12 @@ let
174174
175175 prePatch = if (cabalFile != null)
176176 then ''cat ${cabalFile} > ${package.identifier.name}.cabal''
177− else lib.optionalString (cabal-generator == "hpack") ''
178− ${buildPackages.haskell-nix.nix-tools.${compiler.nix-name}}/bin/hpack
179− '';
177+ else
178+ # When building hpack package we use the internal nix-tools
179+ # (compiled with a fixed GHC version)
180+ lib.optionalString (cabal-generator == "hpack") ''
181+ ${buildPackages.haskell-nix.internal-nix-tools}/bin/hpack
182+ '';
180183 }
181184 # patches can (if they like) depend on the version and revision of the package.
182185 // lib.optionalAttrs (patches != []) {