haskellPackages.basement: fix on ghcjs

2026-02-23 13:07:23 +00:00
parent 031b5938e7
commit de44764f21
2 changed files with 14 additions and 4 deletions
@@ -494,6 +494,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
@@ -503,10 +504,8 @@ 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;

@@ -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