dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Clean up overrides for Haskell gio, glib, and gtk.

Browse Source
This commit is contained in:
Peter Simons 2015-12-16 21:58:45 +01:00
parent c58c68a037
commit fc2b8edb1a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -248,9 +248,13 @@ self: super: {
jwt = dontCheck super.jwt; jwt = dontCheck super.jwt;
# https://github.com/NixOS/cabal2nix/issues/136 # 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; }; 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; }; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
# Need WebkitGTK, not just webkit. # Need WebkitGTK, not just webkit.