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)
commitf9e3eafbe07da7a2c5f0b190d92f4e4dee4f5294 authorRichard Wallace <richard.wallace@simspace.com> dateWed 19 May 2021, 19:26 (5 years ago) parent197eddd
1 file changed+5−3
compare with iko/ghcjs-patch-master
unifiedsplit
builder/comp-builder.nix+5−3
builder/comp-builder.nix+5−3
@@ -488,13 +488,15 @@ let
488488 lib.optionalString (configureAllComponents || keepSource) ''
489489 mv dist dist-tmp-dir
490490 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
492492 mv dist-tmp-dir/build/${componentId.cname}/autogen dist/build/
493− else
493+ elif [ -d dist-tmp-dir/build/autogen ]; then
494494 mv dist-tmp-dir/build/autogen dist/build/
495495 fi
496496 mv dist-tmp-dir/package.conf.inplace dist/
497− remove-references-to -t $out dist/build/autogen/*
497+ if [ -d dist/build/autogen ]; then
498+ remove-references-to -t $out dist/build/autogen/*
499+ fi
498500 rm -rf dist-tmp-dir
499501 ''
500502 ) + (lib.optionalString (keepSource && haskellLib.isLibrary componentId) ''