diff options
| author | Peter Simons <simons@cryp.to> | 2017-03-18 18:36:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2017-03-20 10:24:58 +0100 |
| commit | d59fe189fd5c2c1094086e847cef3b5b7fb84a31 (patch) | |
| tree | bed6b8f976dc73211f45060ba5cfb5d2a27357d1 | |
| parent | 6236cd47166a1e35ed7712e480065ec4e3ebc180 (diff) | |
| download | nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.tar nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.tar.gz nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.tar.bz2 nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.tar.lz nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.tar.xz nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.tar.zst nixlib-d59fe189fd5c2c1094086e847cef3b5b7fb84a31.zip | |
haskell-configuration-nix: drop obsolete webkit-related overrides
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 981a48055bcc..017f2ea7637a 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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; }; |