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

haskell-gtk3: fix build by adding the missing pkgs.gtk3 build input

Browse Source 
The entry in hackage-packages.nix isn't generated correctly: https://github.com/NixOS/cabal2nix/issues/145.

Fixes https://github.com/NixOS/nixpkgs/issues/6190.
This commit is contained in:
Peter Simons 2015-02-06 13:40:12 +01:00
parent 3f9bec6e05
commit 88c8c7662c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,8 +151,9 @@ self: super: {
wizards = doJailbreak super.wizards;
# https://github.com/NixOS/cabal2nix/issues/136
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
# https://github.com/jgm/zip-archive/issues/21
zip-archive = addBuildTool super.zip-archive pkgs.zip;

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

@ -51519,7 +51519,6 @@ self: {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the Gtk+ graphical user interface library";
license = stdenv.lib.licenses.lgpl21;
hydraPlatforms = stdenv.lib.platforms.none;
}) { gtk3 = null;};
"gtk3-mac-integration" = callPackage