git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
there isn't always an autogen directory on macOS, which can cause the builds to fail (#1117)
f9e3eafRichard Wallace
builder/comp-builder.nix+5−3
compare with iko/ghcjs-patch-master
unifiedsplit
@@ -488,13 +488,15 @@ let
488 lib.optionalString (configureAllComponents || keepSource) ''
488 lib.optionalString (configureAllComponents || keepSource) ''
489 mv dist dist-tmp-dir
489 mv dist dist-tmp-dir
490 mkdir -p dist/build
490 mkdir -p dist/build
491− if [ -d dist-tmp-dir/build/${componentId.cname} ]; then
491+ if [ -d dist-tmp-dir/build/${componentId.cname}/autogen ]; then
492 mv dist-tmp-dir/build/${componentId.cname}/autogen dist/build/
492 mv dist-tmp-dir/build/${componentId.cname}/autogen dist/build/
493− else
493+ elif [ -d dist-tmp-dir/build/autogen ]; then
494 mv dist-tmp-dir/build/autogen dist/build/
494 mv dist-tmp-dir/build/autogen dist/build/
495 fi
495 fi
496 mv dist-tmp-dir/package.conf.inplace dist/
496 mv dist-tmp-dir/package.conf.inplace dist/
497+ if [ -d dist/build/autogen ]; then
497− remove-references-to -t $out dist/build/autogen/*
498+ remove-references-to -t $out dist/build/autogen/*
499+ fi
498 rm -rf dist-tmp-dir
500 rm -rf dist-tmp-dir
499 ''
501 ''
500 ) + (lib.optionalString (keepSource && haskellLib.isLibrary componentId) ''
502 ) + (lib.optionalString (keepSource && haskellLib.isLibrary componentId) ''