diff options
Diffstat (limited to 'pkgs/applications/graphics/paraview/default.nix')
-rw-r--r-- | pkgs/applications/graphics/paraview/default.nix | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 452b889566e7..6b74a58ef9f3 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,35 +1,15 @@ { fetchurl, stdenv, cmake, qt4 }: stdenv.mkDerivation { - name = "paraview-3.4.0"; + name = "paraview-3.6.1"; src = fetchurl { - url = http://www.paraview.org/files/v3.4/paraview-3.4.0.tar.gz; - sha256 = "27544f442e957e9aa60b32c674f2dcd84fffeecc9a40071ef6e305333413187d"; + url = http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz; + sha256 = "1dh0dqbdvjagy122nbwr1gg03ck2if2aqqbvzcpkx38sz12cjh7h"; }; - patches = [ ./include-qobject.patch ]; - - # I added these flags to get all the rpaths right, which I guess they are - # taken from the qt4 sources. Not very nice. - cmakeFlags = "-DCMAKE_SHARED_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4\"" + - " -DCMAKE_EXE_LINKER_FLAGS=\"-Wl,-rpath,$out/lib/paraview-3.4" + - " -lpng12 -lSM -lICE -lXrender -lXrandr -lXcursor -lXinerama" + - " -lXfixes -lfreetype -lfontconfig -lXext -lX11 -lssl -lXt -lz\"" + - " -DCMAKE_SKIP_BUILD_RPATH=ON" + - " -DCMAKE_BUILD_TYPE=Release" + - " -DCMAKE_INSTALL_PREFIX=$out"; - - dontUseCmakeConfigure = true; - - # I rewrote the configure phase to get the $out references evaluated in - # cmakeFlags - configurePhase = '' - set -x - mkdir -p build; - cd build - eval -- "cmake .. $cmakeFlags" - set +x - ''; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/paraview-3.6" + ''; buildInputs = [ cmake qt4 ]; |