From f5835de64ec7e9898ebf7eb04b3ad22e7916ecc7 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Fri, 17 May 2024 21:47:59 +0100 Subject: [PATCH] haskellPackages.reflex-dom: fix build on darwin --- pkgs/development/haskell-modules/configuration-darwin.nix | 6 ++++-- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index f3267f376b62..ee3f0503d994 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -317,11 +317,13 @@ self: super: ({ # Tests fail on macOS https://github.com/mrkkrp/zip/issues/112 zip = dontCheck super.zip; - # cabal lib set as unbuildable in linux so callCabal2nix generates a dummy derivation jsaddle-wkwebview = overrideCabal (drv: { libraryFrameworkDepends = with pkgs.buildPackages.darwin.apple_sdk.frameworks; [ Cocoa WebKit ]; - libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; + libraryHaskellDepends = with self; [ aeson data-default jsaddle ]; # cabal2nix doesn't add darwin-only deps }) super.jsaddle-wkwebview; + reflex-dom = overrideCabal (drv: { + libraryHaskellDepends = with self; [ base bytestring jsaddle-wkwebview reflex reflex-dom-core text ]; # cabal2nix doesn't add darwin-only deps + }) super.reflex-dom; } // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2294abaea138..544fc45772c1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -669,7 +669,6 @@ unsupported-platforms: Raincat: [ platforms.darwin ] reactive-balsa: [ platforms.darwin ] # depends on alsa-core reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] - reflex-dom: [ platforms.darwin ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] rsi-break: [ platforms.darwin ] # depends on monomer rtlsdr: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index be1785dc5262..573d17b2bf6c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -255323,7 +255323,6 @@ self: { ]; description = "Functional Reactive Web Apps with Reflex"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; maintainers = [ lib.maintainers.maralorn ]; }) {};