From 743c7e35391eafacf0a3ce2012101ea16fbc7727 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 21 Feb 2012 12:57:23 +0000
Subject: [PATCH] Let hydra build paraview with qt-4.7 and qt-4.8
svn path=/nixpkgs/trunk/; revision=32452
---
pkgs/applications/graphics/paraview/default.nix | 4 ++--
pkgs/top-level/all-packages.nix | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 0c00553f2711..ba67a755de4b 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -3,7 +3,7 @@
, mpich2
, python
, libxml2
-, mesa
+, mesa, libXt
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
- buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
+ buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
meta = {
homepage = "http://www.paraview.org/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c2a7736a7d2..8936f6fd7005 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7354,6 +7354,8 @@ let
qt4 = qt47;
};
+ paraviewQt48 = paraview.override { qt4 = qt48; };
+
pdftk = callPackage ../tools/typesetting/pdftk { };
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {