From f42ab674ba34f9a516c36f4e259942df8f27e947 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 28 Sep 2021 13:30:12 +0200 Subject: [PATCH] haskellPackages.webkit: remove override for broken package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit webkitgtk24x-gtk2 has been removed, but webkit doesn't compile anymore these days, so we can save us maintaining this override. The “correct” override would be webkitgtk (webkit is an alias form webkitgtk atm, maybe we should introduce a libNixName thing in cabal2nix for this?) if webkit compiled with modern dependencies… --- pkgs/development/haskell-modules/configuration-nix.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index b655f7be7911..55c5915bf793 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -140,9 +140,6 @@ self: super: builtins.intersectAttrs super { # Add necessary reference to gtk3 package gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3; - # Need WebkitGTK, not just webkit. - webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; }; - hs-mesos = overrideCabal super.hs-mesos (drv: { # Pass _only_ mesos; the correct protobuf is propagated. extraLibraries = [ pkgs.mesos ];