From 1cb5e9f635081ce7ef2962c3804a22d3afb5205e Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Tue, 17 Feb 2026 23:22:21 +0000 Subject: [PATCH] haskellPackages: don't use external interpreter by default in ghcjs --- pkgs/development/haskell-modules/generic-builder.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 4e3617e7efab..a0990a1972a3 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -23,6 +23,8 @@ let crossSupport = rec { emulator = stdenv.hostPlatform.emulator buildPackages; + needsExternalInterpreterSetup = !stdenv.hostPlatform.isGhcjs; # JS backend already handles this + canProxyTH = # iserv-proxy currently does not build on GHC 9.6 lib.versionAtLeast ghc.version "9.8" && stdenv.hostPlatform.emulatorAvailable buildPackages; @@ -258,8 +260,8 @@ in # of `meta.pkgConfigModules`. This option defaults to false for now, since # this metadata is far from complete in nixpkgs. __onlyPropagateKnownPkgConfigModules ? false, - - enableExternalInterpreter ? isCross && crossSupport.canProxyTH, + enableExternalInterpreter ? + isCross && crossSupport.canProxyTH && crossSupport.needsExternalInterpreterSetup, }@args: assert editedCabalFile != null -> revision != null;