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

haskell packages: fix webkit build

Browse source 
cc @peti
This commit is contained in:
Nikolay Amiantov 2015-08-13 15:19:20 +03:00
parent 7307f5c011
commit 745c60dfaa
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,14 +259,8 @@ self: super: {
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
# webkit does not recognize its system library build input any more.
webkit = markBroken super.webkit; # http://hydra.cryp.to/build/1041942/nixlog/1/raw
ghcjs-dom-hello = dontDistribute super.ghcjs-dom-hello; # depends on broken webkit
ghcjs-dom = dontDistribute super.ghcjs-dom; # depends on broken webkit
jsaddle-hello = dontDistribute super.jsaddle-hello; # depends on broken webkit
reflex-dom = dontDistribute super.reflex-dom; # depends on broken webkit
# Need WebkitGTK, not just webkit.
webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };
webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };