MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

haskell-ng: fix webkit and websnap

Browse source
This commit is contained in:
Peter Simons 2015-04-02 14:49:57 +02:00
parent 82893282dd
commit 27842ccd75
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -214,8 +214,10 @@ self: super: {
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
# Need WebkitGTK, not just webkit. # Need WebkitGTK, not just webkit.
webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; };
webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; }; webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; }; webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
# https://github.com/jgm/zip-archive/issues/21 # https://github.com/jgm/zip-archive/issues/21
zip-archive = addBuildTool super.zip-archive pkgs.zip; zip-archive = addBuildTool super.zip-archive pkgs.zip;
@ -645,19 +647,6 @@ self: super: {
haroonga = markBroken super.haroonga; haroonga = markBroken super.haroonga;
haroonga-httpd = markBroken super.haroonga-httpd; haroonga-httpd = markBroken super.haroonga-httpd;
# Cannot find pkg-config data for "webkit-1.0".
lambdacat = dontDistribute super.lambdacat;
manatee-all = dontDistribute super.manatee-all;
manatee-browser = dontDistribute super.manatee-browser;
manatee-reader = dontDistribute super.manatee-reader;
markup-preview = dontDistribute super.markup-preview;
spike = dontDistribute super.spike;
tianbar = dontDistribute super.tianbar;
web-browser-in-haskell = dontDistribute super.web-browser-in-haskell;
webkit = markBroken super.webkit; # .override { webkit = pkgs.webkitgtk24x; };
webkit-javascriptcore = dontDistribute super.webkit-javascriptcore;
websnap = markBroken super.websnap; # .override { webkit = pkgs.webkitgtk24x; };
# Build is broken and no contact info available. # Build is broken and no contact info available.
hopenpgp-tools = markBroken super.hopenpgp-tools; hopenpgp-tools = markBroken super.hopenpgp-tools;