public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell-ng: fix 'gio' and 'pango' builds

Browse Source 
This fixes https://github.com/NixOS/nixpkgs/issues/5863.
This commit is contained in:
Peter Simons 2015-01-20 12:56:04 +01:00
parent b9c761966b
commit 4ab133a2c4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,6 +149,10 @@ self: super: {
sha256 = "0q8j9zwi5q651q5zd3mz52nz4ki36rvixbkp20nx2vf5imi050bq"; sha256 = "0q8j9zwi5q651q5zd3mz52nz4ki36rvixbkp20nx2vf5imi050bq";
})];}); })];});
# https://github.com/NixOS/cabal2nix/issues/136
gio = overrideCabal (super.gio.override { glib = self.glib; }) (drv: { pkgconfigDepends = [pkgs.glib]; });
pango = super.pango.override { cairo = self.cairo; };
} }
// { // {
# Not on Hackage yet. # Not on Hackage yet.

3
pkgs/development/haskell-modules/hackage-packages.nix
View File

@ -48230,7 +48230,6 @@ self: {
homepage = "http://projects.haskell.org/gtk2hs/"; homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GIO"; description = "Binding to the GIO";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs) glib;}; }) { inherit (pkgs) glib;};
"gipeda" = callPackage "gipeda" = callPackage
@ -48938,7 +48937,6 @@ self: {
homepage = "http://projects.haskell.org/gtk2hs/"; homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the glade library"; description = "Binding to the glade library";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs.gnome) libglade;}; }) { inherit (pkgs.gnome) libglade;};
"gladexml-accessor" = callPackage "gladexml-accessor" = callPackage
@ -86554,7 +86552,6 @@ self: {
homepage = "http://projects.haskell.org/gtk2hs/"; homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Pango text rendering engine"; description = "Binding to the Pango text rendering engine";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) { inherit (pkgs) cairo; inherit (pkgs.gnome) pango;}; }) { inherit (pkgs) cairo; inherit (pkgs.gnome) pango;};
"papillon" = callPackage "papillon" = callPackage