summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Alan Dorman <mdorman@ironicdesign.com>2017-03-07 08:24:22 -0500
committerPeter Simons <simons@cryp.to>2017-03-08 15:17:39 +0100
commit763e21e982370f67c126f92a1113ea949db3b6e0 (patch)
treee3fa802b24f1c3253b36da51460e628ec66661fe
parentd7496b560edc773d89fad211a8f446d286fff984 (diff)
downloadnixlib-763e21e982370f67c126f92a1113ea949db3b6e0.tar
nixlib-763e21e982370f67c126f92a1113ea949db3b6e0.tar.gz
nixlib-763e21e982370f67c126f92a1113ea949db3b6e0.tar.bz2
nixlib-763e21e982370f67c126f92a1113ea949db3b6e0.tar.lz
nixlib-763e21e982370f67c126f92a1113ea949db3b6e0.tar.xz
nixlib-763e21e982370f67c126f92a1113ea949db3b6e0.tar.zst
nixlib-763e21e982370f67c126f92a1113ea949db3b6e0.zip
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`.
-rw-r--r--pkgs/development/haskell-modules/configuration-nix.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 3ec5ffc3d968..85421ba960e8 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; };