From 7f75de06325e00ba28dc93abbf3697bde9354d7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 20 Feb 2012 18:00:09 +0000 Subject: [PATCH] soqt, meshlab and paraview fail to build with qt 4.8. I set them for qt 4.7. svn path=/nixpkgs/trunk/; revision=32433 --- pkgs/top-level/all-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b343872ca6c..46ed9f5f598 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4628,7 +4628,9 @@ let soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { }; + soqt = callPackage ../development/libraries/soqt { + qt4 = qt47; + }; speechd = callPackage ../development/libraries/speechd { }; @@ -7192,7 +7194,7 @@ let merkaartor = callPackage ../applications/misc/merkaartor { }; meshlab = callPackage ../applications/graphics/meshlab { - qt = qt4; + qt = qt47; }; midori = builderDefsPackage (import ../applications/networking/browsers/midori) { @@ -7350,6 +7352,7 @@ let }; paraview = callPackage ../applications/graphics/paraview { + qt4 = qt47; }; pdftk = callPackage ../tools/typesetting/pdftk { };