Merge pull request #312541 from alexfmpe/reflex-dom

haskellPackages.reflex-dom: platform fixes
This commit is contained in:
Naïm Favier
2024-05-18 13:17:01 +02:00
committed by GitHub
4 changed files with 10 additions and 4 deletions
@@ -3098,6 +3098,12 @@ self: super: {
tasty-quickcheck = super.tasty-quickcheck_0_10_3;
});
# Fixes build on some platforms: https://github.com/obsidiansystems/commutative-semigroups/pull/18
commutative-semigroups = appendPatch (fetchpatch {
url = "https://github.com/obsidiansystems/commutative-semigroups/commit/e031495dd24ae73ffb808eca34e993f5df8e8d76.patch";
hash = "sha256-d7AwvGGUJlh/sOXaAbfQLCay6+JyNInb73TTGKkBDz8=";
}) super.commutative-semigroups;
# Too strict bounds on text. Can be removed after https://github.com/alx741/currencies/pull/3 is merged
currencies = doJailbreak super.currencies;
@@ -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
@@ -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 ]
-1
View File
@@ -255323,7 +255323,6 @@ self: {
];
description = "Functional Reactive Web Apps with Reflex";
license = lib.licenses.bsd3;
badPlatforms = lib.platforms.darwin;
maintainers = [ lib.maintainers.maralorn ];
}) {};