From fe5573f28327d12a1c47ec61d6bbe0cc9d7983dd Mon Sep 17 00:00:00 2001 From: amesgen <amesgen@amesgen.de> Date: Wed, 14 May 2025 00:45:10 +0200 Subject: [PATCH] Nix: also add `--with-haddock` if possible --- pkgs/wasm32-wasi-cabal.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/wasm32-wasi-cabal.nix b/pkgs/wasm32-wasi-cabal.nix index 05f942a..0e39f65 100644 --- a/pkgs/wasm32-wasi-cabal.nix +++ b/pkgs/wasm32-wasi-cabal.nix @@ -41,6 +41,13 @@ let ${coreutils}/bin/cp ${../cabal.legacy.config} "$CABAL_DIR/config" ${coreutils}/bin/chmod u+w "$CABAL_DIR/config" ''; + withHaddock = lib.optionalString + ( + !lib.elem flavour [ + "9.6" + "9.8" + ] + ) "--with-haddock=${wasm32-wasi-ghc}/bin/wasm32-wasi-haddock"; in writeShellScriptBin "wasm32-wasi-cabal" '' export CABAL_DIR="''${CABAL_DIR:-$HOME/.ghc-wasm/.cabal}" @@ -55,5 +62,6 @@ writeShellScriptBin "wasm32-wasi-cabal" '' --with-compiler=${wasm32-wasi-ghc}/bin/wasm32-wasi-ghc \ --with-hc-pkg=${wasm32-wasi-ghc}/bin/wasm32-wasi-ghc-pkg \ --with-hsc2hs=${wasm32-wasi-ghc}/bin/wasm32-wasi-hsc2hs \ + ${withHaddock} \ ''${1+"$@"} '' -- GitLab