diff options
| author | Peter Simons <simons@cryp.to> | 2015-12-16 21:58:45 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-12-17 00:32:16 +0100 |
| commit | fc2b8edb1a087fcd199c70851c950ffd90002a44 (patch) | |
| tree | 08589ec4c8dc88a4319c6c1111ef93fc2c3b38dc /pkgs/development/haskell-modules/configuration-common.nix | |
| parent | c58c68a037e9d24b05a78003348e20d2f19e0216 (diff) | |
| download | nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.tar nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.tar.gz nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.tar.bz2 nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.tar.lz nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.tar.xz nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.tar.zst nixlib-fc2b8edb1a087fcd199c70851c950ffd90002a44.zip | |
Clean up overrides for Haskell gio, glib, and gtk.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41fdfad528a0..4a164beb2468 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -248,9 +248,13 @@ self: super: { jwt = dontCheck super.jwt; # https://github.com/NixOS/cabal2nix/issues/136 - glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib]; + gio = addPkgconfigDepend super.gio pkgs.glib; + gio_0_13_0_3 = addPkgconfigDepend super.gio_0_13_0_3 pkgs.glib; + gio_0_13_0_4 = addPkgconfigDepend super.gio_0_13_0_4 pkgs.glib; + gio_0_13_1_0 = addPkgconfigDepend super.gio_0_13_1_0 pkgs.glib; + glib = addPkgconfigDepend super.glib pkgs.glib; gtk3 = super.gtk3.override { inherit (pkgs) gtk3; }; - gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk]; + gtk = addPkgconfigDepend super.gtk pkgs.gtk; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; # Need WebkitGTK, not just webkit. |