From 88c8c7662ceddf0f0830df1e3fa16a3a971e2d3c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 6 Feb 2015 13:40:12 +0100 Subject: [PATCH] haskell-gtk3: fix build by adding the missing pkgs.gtk3 build input 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. --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- pkgs/development/haskell-modules/hackage-packages.nix | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b72e4d9a33..fa83b600a3f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c2fb2db12c6..cd4ecf5511d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -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