From 763e21e982370f67c126f92a1113ea949db3b6e0 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 7 Mar 2017 08:24:22 -0500 Subject: [PATCH] haskell-gi-base: propagate gobjectIntrospection dependency So the thinking is: anything that needs `haskell-gi-base` is going to need `gobjectIntrospection` in order to work correctly; by adding this one `buildDepends` (which therefore gets propagated), we put ourselves in a position to simplify away a bunch of code in `cabal2nix`. --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3ec5ffc3d96..85421ba960e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -420,6 +420,9 @@ self: super: builtins.intersectAttrs super { # tests require git hapistrano = addBuildTool super.hapistrano pkgs.git; + # 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; };