diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bbcc30d918da..01adce84a872 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -539,6 +539,7 @@ with haskellLib; jpeg-turbo = dontCheck super.jpeg-turbo; JuicyPixels-jpeg-turbo = dontCheck super.JuicyPixels-jpeg-turbo; + # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation basement = appendPatches [ # Fixes compilation for basement on i686 # https://github.com/haskell-foundation/foundation/pull/573 @@ -548,13 +549,15 @@ with haskellLib; sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7"; stripLen = 1; }) - - # Fixes compilation on windows - # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation - ./patches/basement-add-cast.patch + ./patches/basement-add-cast.patch # Fixes compilation on windows + ./patches/basement-ghcjs.patch # Fixes compilation on ghcjs ] super.basement; + # Repo is archived, package is abandoned: https://github.com/haskell-foundation/foundation + # Fixes compilation on ghcjs + foundation = appendPatch ./patches/foundation-ghcjs.patch super.foundation; + # Fixes compilation of memory with GHC >= 9.4 on 32bit platforms # https://github.com/vincenthz/hs-memory/pull/99 memory = appendPatches [ diff --git a/pkgs/development/haskell-modules/patches/basement-ghcjs.patch b/pkgs/development/haskell-modules/patches/basement-ghcjs.patch new file mode 100644 index 000000000000..aa858a9c9b48 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/basement-ghcjs.patch @@ -0,0 +1,11 @@ +diff --git a/basement.cabal b/basement.cabal +index f85f617..1484ad7 100644 +--- a/basement.cabal ++++ b/basement.cabal +@@ -156,4 +156,5 @@ library + else + cpp-options: -DARCH_IS_UNKNOWN_ENDIAN + include-dirs: cbits +- c-sources: cbits/foundation_mem.c ++ if !os(ghcjs) ++ c-sources: cbits/foundation_mem.c diff --git a/pkgs/development/haskell-modules/patches/foundation-ghcjs.patch b/pkgs/development/haskell-modules/patches/foundation-ghcjs.patch new file mode 100644 index 000000000000..1b2cd33d63ab --- /dev/null +++ b/pkgs/development/haskell-modules/patches/foundation-ghcjs.patch @@ -0,0 +1,14 @@ +diff --git a/foundation.cabal b/foundation.cabal +index d33d874..654488b 100644 +--- a/foundation.cabal ++++ b/foundation.cabal +@@ -169,7 +169,8 @@ library + Foundation.System.Bindings.Hs + + include-dirs: cbits +- c-sources: cbits/foundation_random.c ++ if !os(ghcjs) ++ c-sources: cbits/foundation_random.c + cbits/foundation_network.c + cbits/foundation_time.c + cbits/foundation_utf8.c