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

haskell-hsqml: fix build

Browse Source
This commit is contained in:
Peter Simons 2015-03-03 14:00:42 +01:00
parent 19f74eebd6
commit 278bea4eda
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -582,6 +582,12 @@ self: super: {
lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins; lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins;
lambdabot-social-plugins = markBroken super.lambdabot-social-plugins; lambdabot-social-plugins = markBroken super.lambdabot-social-plugins;
# Upstream provides no issue tracker and no contact details.
vivid = markBroken super.vivid;
# Test suite wants to connect to $DISPLAY.
hsqml = dontCheck super.hsqml;
} // { } // {
# Not on Hackage. # Not on Hackage.

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

@ -65742,9 +65742,8 @@ self: {
}) { inherit (pkgs) sqlite;}; }) { inherit (pkgs) sqlite;};
"hsqml" = callPackage "hsqml" = callPackage
({ mkDerivation, base, c2hs, containers, directory, filepath ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5
, Qt5Core, Qt5Gui, Qt5Qml, Qt5Quick, Qt5Widgets, QuickCheck, tagged , QuickCheck, tagged, text, transformers
, text, transformers
}: }:
mkDerivation { mkDerivation {
pname = "hsqml"; pname = "hsqml";
@ -65755,13 +65754,11 @@ self: {
]; ];
testDepends = [ base containers directory QuickCheck tagged text ]; testDepends = [ base containers directory QuickCheck tagged text ];
buildTools = [ c2hs ]; buildTools = [ c2hs ];
pkgconfigDepends = [ Qt5Core Qt5Gui Qt5Qml Qt5Quick Qt5Widgets ]; pkgconfigDepends = [ qt5 ];
homepage = "http://www.gekkou.co.uk/software/hsqml/"; homepage = "http://www.gekkou.co.uk/software/hsqml/";
description = "Haskell binding for Qt Quick"; description = "Haskell binding for Qt Quick";
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none; }) { inherit (pkgs) qt5;};
}) { Qt5Core = null; Qt5Gui = null; Qt5Qml = null;
Qt5Quick = null; Qt5Widgets = null;};
"hsqml-demo-morris" = callPackage "hsqml-demo-morris" = callPackage
({ mkDerivation, base, containers, deepseq, directory, hsqml ({ mkDerivation, base, containers, deepseq, directory, hsqml