Author: urkud
Date: Tue Feb 21 12:57:23 2012
New Revision: 32452
URL: https://nixos.org/websvn/nix/?rev=32452&sc=1
Log:
Let hydra build paraview with qt-4.7 and qt-4.8
Modified:
nixpkgs/trunk/pkgs/applications/graphics/paraview/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/graphics/paraview/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/graphics/paraview/default.nix Tue Feb
21 11:34:57 2012 (r32451)
+++ nixpkgs/trunk/pkgs/applications/graphics/paraview/default.nix Tue Feb
21 12:57:23 2012 (r32452)
@@ -3,7 +3,7 @@
, mpich2
, python
, libxml2
-, mesa
+, mesa, libXt
}:
stdenv.mkDerivation rec {
@@ -34,7 +34,7 @@
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/";;
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 21 11:34:57
2012 (r32451)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Feb 21 12:57:23
2012 (r32452)
@@ -7354,6 +7354,8 @@
qt4 = qt47;
};
+ paraviewQt48 = paraview.override { qt4 = qt48; };
+
pdftk = callPackage ../tools/typesetting/pdftk { };
pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
