diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-21 12:57:23 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-21 12:57:23 +0000 |
| commit | 743c7e35391eafacf0a3ce2012101ea16fbc7727 (patch) | |
| tree | b8893dc63deebbfdcec33bd2514a6474c62a33f6 /pkgs | |
| parent | a81366984eddd197fc41cbc5ec881ade59273c53 (diff) | |
| download | nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.tar nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.tar.gz nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.tar.bz2 nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.tar.lz nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.tar.xz nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.tar.zst nixpkgs-743c7e35391eafacf0a3ce2012101ea16fbc7727.zip | |
Let hydra build paraview with qt-4.7 and qt-4.8
svn path=/nixpkgs/trunk/; revision=32452
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 4 | ||||
| -rw-r--r-- | 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 0c00553f271..ba67a755de4 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 8c2a7736a7d..8936f6fd700 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 { |