mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

haskell-configuration-nix: drop obsolete webkit-related overrides

Browse source
This commit is contained in:
Peter Simons 2017-03-18 18:36:45 +01:00
parent 6236cd4716
commit d59fe189fd
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,8 +131,6 @@ self: super: builtins.intersectAttrs super {
# 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; };
hs-mesos = overrideCabal super.hs-mesos (drv: {
@ -433,10 +431,6 @@ self: super: builtins.intersectAttrs super {
# This propagates this to everything depending on haskell-gi-base
haskell-gi-base = addBuildDepend super.haskell-gi-base pkgs.gobjectIntrospection;
# requires webkitgtk API version 3 (webkitgtk 2.4 is the latest webkit supporting that version)
gi-javascriptcore = super.gi-javascriptcore.override { webkitgtk = pkgs.webkitgtk24x; };
gi-webkit = super.gi-webkit.override { webkit = pkgs.webkitgtk24x; };
# Requires gi-javascriptcore API version 4
gi-webkit2 = super.gi-webkit2.override { gi-javascriptcore = self.gi-javascriptcore_4_0_11; };