swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 04:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247941 from maralorn/reflex-dom

Browse source 
haskellPackages.reflex-dom: Fix build
This commit is contained in:
maralorn 2023-08-08 16:06:03 +02:00 committed by GitHub
parent d2aaed5f9a 9fda0fb7ec
commit a6f9c3e87e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1438,7 +1438,6 @@ self: super: {
});
};
# 2023-06-24: too strict upper bound on bytestring
jsaddle-webkit2gtk =
appendPatches [
(pkgs.fetchpatch {
@ -1455,7 +1454,14 @@ self: super: {
stripLen = 1;
includes = [ "jsaddle-webkit2gtk.cabal" ];
})
] super.jsaddle-webkit2gtk;
]
(overrideCabal (old: {
postPatch = old.postPatch or "" + ''
sed -i 's/aeson.*,/aeson,/' jsaddle-webkit2gtk.cabal
sed -i 's/text.*,/text,/' jsaddle-webkit2gtk.cabal
'';
})
super.jsaddle-webkit2gtk);
# 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19
jsaddle-dom = overrideCabal (old: {

7
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -1314,7 +1314,10 @@ self: super: builtins.intersectAttrs super {
sydtest = dontCheck super.sydtest;
# Prevent argv limit being exceeded when invoking $CC.
gi-javascriptcore = overrideCabal {
inherit (lib.mapAttrs (_: overrideCabal {
__onlyPropagateKnownPkgConfigModules = true;
} super.gi-javascriptcore;
}) super)
gi-javascriptcore
webkit2gtk3-javascriptcore
gi-webkit2;
}