From faa92cd30b1079e76b99716aa92df7cc5c552dd6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 19 Feb 2023 16:19:18 +0100 Subject: [PATCH] pkgsCross.ghcjs.haskellPackages.ghc: formally disable shared libs Hadrian does this automatically unfortunately, but unless we correctly set enableShared as well, mkDerivation will try building shared libs which will inevitably fail due to missing shared core packages. Let's stay away from fully_static which does a lot of funky stuff and was not working before anyways for pkgsStatic. --- pkgs/development/compilers/ghc/common-hadrian.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 5f0953b1bca3..0539efbd800b 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -62,7 +62,7 @@ , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. - enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic && !isGhcjs , # Whether to build terminfo. enableTerminfo ? !(stdenv.targetPlatform.isWindows @@ -91,7 +91,7 @@ transformers = lib.optionals useLLVM [ "llvm" ] ++ lib.optionals (!enableShared) [ - "fully_static" + "no_dynamic_libs" "no_dynamic_ghc" ] ++ lib.optionals (!enableProfiledLibs) [ "no_profiled_libs" ]