From f4ed1f98d1d3b7ebac460b8bca623ec964012baf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 21 Apr 2017 15:55:56 +0200 Subject: [PATCH] haskell-gtksourceview: clean up overrides for versions 2 and 3 of the package --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f03fc73387f..b9e96886ac5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -126,8 +126,7 @@ self: super: builtins.intersectAttrs super { glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; - gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; - gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; + gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2; # Need WebkitGTK, not just webkit. webkit = super.webkit.override { webkit = pkgs.webkitgtk2; };