Let hydra build paraview with qt-4.7 and qt-4.8
svn path=/nixpkgs/trunk/; revision=32452
This commit is contained in:
parent
a81366984e
commit
743c7e3539
@ -3,7 +3,7 @@
|
|||||||
, mpich2
|
, mpich2
|
||||||
, python
|
, python
|
||||||
, libxml2
|
, libxml2
|
||||||
, mesa
|
, mesa, libXt
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
|
buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa libXt ];
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
homepage = "http://www.paraview.org/";
|
homepage = "http://www.paraview.org/";
|
||||||
|
@ -7354,6 +7354,8 @@ let
|
|||||||
qt4 = qt47;
|
qt4 = qt47;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
paraviewQt48 = paraview.override { qt4 = qt48; };
|
||||||
|
|
||||||
pdftk = callPackage ../tools/typesetting/pdftk { };
|
pdftk = callPackage ../tools/typesetting/pdftk { };
|
||||||
|
|
||||||
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
|
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user