Commit 0dad55e8 authored by sternenseemann's avatar sternenseemann
Browse files

pkgsCross.ghcjs.ghc: fix rts/Types.h missing for GHC >= 9.12.3

parent 74e27e56

pkgs/development/compilers/ghc/common-hadrian.nix

+13 −0
Original line number Diff line number Diff line
@@ -323,6 +323,19 @@ 
      # Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810

      ++ [ ./ghc-9.6-or-later-docs-sphinx-9.patch ]



      # Fixes rts/Types.h missing from the install when targeting javascript

      # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line

      # https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line

      # TODO(@sternenseemann): patch likely included in 9.12.4

      ++ lib.optionals (lib.versionAtLeast version "9.12.3" && lib.versionOlder version "9.15") [

        (fetchpatch {

          name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";

          url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";

          hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";

          includes = [ "rts/rts.cabal" ];

        })

      ]



      ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });



    stdenv = stdenvNoCC;